Re: Hating on git part 2
Reply #3 –
Yep, keep the master up-to-date is important.
As well as remember to always start working on a branch and never on master.
What I usually do when I'm not sure if a rebase will have conflicts or not is:
git checkout branch_to_rebase
git checkout -b branch_to_rebase_back
git checkout branch_to_rebase
git rebase master
[...]
git branch -D branch_to_rebase_back
So I create a backup branch, I do the rebase on the "original" branch and if successful (and if I remember) I delete the backup.