When you rebase a commit or a branch on top of a different HEAD, you may 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.
Continuing a rebase with merge conflicts
Get Git Version Control Cookbook 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.
