Git Rebase Repository contains unmerged paths
egit, git
Solution
The way to mark files as resolved (in both EGit and command line Git) is to add them to the index:
Open the context menu of the file > Team > Add to Index
After that, continuing the rebase should be possible.
Problem
How do you fix a failed rebase with git? I received a pull request on github for some relevatively minor changes to a single file, so I accepted and then in my local branch, fetched the changes and performed a rebase. However, for some reason, git found conflicts, even though I had not modified the file since the contributor's modification. I used EGit to resolve the conflicts, which were trivially, but now I'm stuck. EGit lists my project as in "rebase interactive" mode and it's still showing the file as conflicting. If I try to do a "Rebase->Continue Rebase" I receive the error "Repository contains unmerged paths". How do I resolve this?