Should you squash pull requests on GitHub?
Squashing pull requests on GitHub has advantages and disadvantages. I generally prefer rebasing locally.
Get my interactive git cheatsheet as soon as it's released here:
https://philomatics.com/git-cheatsheet/
My best video yet (interactive rebase)
• git interactive rebase - Undo, Edit & Squa...
My first video on git rebase (without --interactive)
• git rebase - Why, When & How to fix conflicts
My Top 10 git shortcuts:
• My most used git aliases
Fixing merge conflicts:
• Never fear merge conflicts again - git mer...
Video on `git pull --rebase`:
• Never* use git pull
How to change your default editor in git:
• My most used git aliases
Use the following command to change your default editor to VSCode:
git config --global core.editor "code --wait"
If you use a different editor, just Google "git set text editor to $yourEditor", it's usually easy to find.
0:00 - Squash
0:35 - Downsides of merging
1:37 - Rebase
2:00 - Comparison
Thank you to angymares for giving excellent ideas and advice during the video creation!
LEGAL DISCLAIMER
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
Everything here is for informational purposes only. All non-licensed clips used for fair use commentary, criticism, and educational purposes. See Hosseinzadeh v. Klein, 276 F.Supp.3d 34 (S.D.N.Y. 2017); Equals Three, LLC v. Jukin Media, Inc., 139 F. Supp. 3d 1094 (C.D. Cal. 2015).e
