Menu
Is there a way to rebase a branch onto another while skipping a particular (conflicting) commit on the other branch?
For example, I want to rebase mybranch onto master, but master contains a commit that will conflict with the commits in master, so I prefer to undo that commit completely.
-o-o-o-o-o-x-o-o-o-o master | o-o-o-o mybranch x marks the conflicting commit.
870
If you run rebase --abort at a later conflict during the same rebase, the skipped commit will be reverted too of course. If your change already existed upstream, Git will not be able to apply your commit (but usually should skip it automatically, if the patch is exactly the same).
The purpose of rebase is make your commits look as if they were changes to the branch you rebase onto. So the most logical way is to incorporate merge conflicts into these commits. No additional commits is required thus.
Use interactive rebase:
git rebase -i master An editor will open and you will have a list of commits like this:
pick b8f7c25 Fix 1 pick 273b0bb Fix 2 pick 6aaea1b Fix 3 Just delete the commit you want to skip. It will be omitted while rebasing your branch onto master.
P.S. If you cannot see the editor, please, refer to this question for solution: How can I set up an editor to work with Git on Windows?
92
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
