Search code examples
eclipsegitmergeegit

How to resolve merge conflicts in multiple commits in EGit?

I have multiple commits (30+) on the same branch that are in conflict with another branch. The conflicts are reported during rebase. I can resolve those conflicts once (in one commit), but repeating it 30 times does not make sense to me.

Any recommendations on how to do this in Eclipse (EGit)? For example, would you recommend using "Skip commit" button?

Solution

    1. Try using merge instead of rebase.

    2. If you have to use rebase, try using git rerere command.

    Details: Git rebase conflicts after successful merge?