Learn Git in a Day

When Rebase Fights Back

Just like merging, a rebase can run into conflicts if both sides changed the same lines. When that happens, Git will pause and ask you to resolve the conflict - the same way you did with merge conflicts in Chapter 5.

After fixing the conflict in the file, continue the rebase:

git add 
git rebase --continue