Continuing a rebase with merge conflicts
When you rebase a commit or a branch on top of a different HEAD
, you will eventually see a conflict.
If there is a conflict, you will be asked to solve the merge conflict and continue with the rebase using git rebase --continue
.
How to do it
We will be creating a commit that adds the same fishtank.txt
file on top of the origin/stable-3.1
branch; then, we will try to rebase this on top of the rebaseExample
branch we created in the Rebasing commits to another branch section:
- Check out a branch named
rebaseExample2
that tracksorigin/stable-3.1
:$ git checkout -b rebaseExample2 --track origin/stable-3.1 Checking out files: 100% (212/212), done. Branch rebaseExample2 set up to track remote branch stable-3.1 from ...
Get Git: Mastering Version Control now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.