Community
Participate
Working Groups
I rebase on the command line and get conflicts. I edit them in Eclipse and select Team -> add to resolve the conflict. When I now enter rebase --continue on the command line there is a message: "You must edit all merge conflicts and then mark them as resolved using git add" However, git status looks as expected. The reolved file is listed under "Changes to be committed:"
I tried to reproduce this problem but was not successful. I am working with EGit 0.10.0.201010171825 from the latest succesful hudson builds. Here is exact script what I did: In Eclipse I ... - switch to a new empty workspace - import all projects from http://egit.eclipse.org/jgit.git - create two branches A and B based on eclipse/master - checkout A - in project org.eclipse.jgit modify first line of /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java to '/**' - save and commit what was changed - checkout B - in project org.eclipse.jgit modify first line of /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java to '/***' - save and commit what was changed Now I switched to MSysGit prompt and ... - cd to home directory of jgit repo - check that B is checked out - type 'git rebase A'. This leads to warnings about Conflicts I switch back to Eclipse and ... - in project org.eclipse.jgit I remove the conflict in the beginning of /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java - I save the file and stage it via 'Team->Add' Now I switched to MSysGit prompt and ... - type 'git rebase --continue' ---- this works! Does this use-case work for you?
Chris, I've seen this one too. On the (DOS) command line I've got pull set to rebase instead of merge. I've seen this when I get a conflict on that rebase operation, and then try using Add in Eclipse to resolve it. I then get the same error that Stefan reported.
I found out that I can reproduce that error with msysgit 1.7.0.2-preview20100309 but not anymore with 1.7.3.1-preview20101002. Something was changed in msysgit that this problem does not occur anymore for me. I asked the msysgit mailing list what they changed. But the solution seems to be clear: upgrade to msysgit 1.7.3.1-preview20101002 or newer. Neale, could you try whether this helps you?
I can confirm that I'm on git version 1.7.0.2.msysgit.0, so it sounds like I've seen the same problem. When I next see fail a rebase, the I'll give it a go. Still sounds like an interesting 'feature' that different versions of git do and don't see EGit's add, but do see there own, so news from the mailing list would be reassuring ;)
I agree, it's a very interesting feature. We triggered a discussion on http://groups.google.com/group/msysgit/browse_thread/thread/b1fe0ff97ce3b996# to ask what msysgit has changed. There is of course the chance that egit add is doing something wrong and msysgit rebase --continue just became more tolerant. Let's wait what the msysgit discussion brings before closing this bug.
Seems this is not a problem anymore
