Just a quick summary mostly for myself:
How to use git pull --rebase to keep your team’s commit history clean.
Command for creating the ‘git pr‘ alias (so you can copy-paste): git config --global alias.pr "pull --rebase"
- Always try
git pull --rebasefirst. It if works, you’re done! - If you get a merge conflix, you can undo everything with
git rebase --abort - Then just pull “normally” using
git pull, or do an interactive rebase (advanced)