Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Egit and Merge issues
Egit and Merge issues [message #761588] Tue, 06 December 2011 12:42 Go to next message
Cesar  is currently offline Cesar
Messages: 1
Registered: December 2011
Junior Member
Dear all,
I am having some problems during the merge process of two branches (associated to other two repositories). The error message is the following one:

Merge of revisions c1d3025c3e1aa376cfd3ffd96f9dd555c4346c71, 75d787f6a776b3cd100f0c87e68f6acc4b59d00b with base 55e0fa5fb5f5ca58008aa005e2c5b186af4f4018 using strategy resolve resulted in: Failed.

Is there any way of finding out what is going on in this particular case? (I need additional information in order to correct the problem...)
Many thanks,
Cesar

PS. I am using Eclipse and Photran during the process.
Re: Egit and Merge issues [message #761862 is a reply to message #761588] Wed, 07 December 2011 02:46 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 491
Registered: July 2009
Senior Member
Currently JGit has an implementation of the resolve merge strategy only. But this can't merge in case the base version can't be determined in one step which would require an implementation of the recursive merge strategy. Try merging using native git which uses the recursive merge strategy by default.
Re: Egit and Merge issues [message #761865 is a reply to message #761588] Wed, 07 December 2011 02:53 Go to previous messageGo to next message
Christian Halstrick is currently offline Christian Halstrick
Messages: 18
Registered: July 2009
Junior Member
This is not a problem of having "recursive" merge strategy. As you can see in the output two commits should be merged and jgit has been able to determine a single base commit. In such cases "recursive" is the same as "resolve".

Therefore I guess it's a standard merge problem. E.g. during merge it was found out that the index is dirty (you added stuff before the merge) or that the working tree is dirty (you modified files in the working tree which the merge wants to overwrite.

Look into http://egit.eclipse.org/w/?p=jgit.git;a=blob;f=org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java;hb=master to see how you do merges and especially how to lookup the error causes.
Re: Egit and Merge issues [message #829525 is a reply to message #761865] Mon, 26 March 2012 08:08 Go to previous messageGo to next message
Paul Shtukov is currently offline Paul Shtukov
Messages: 3
Registered: March 2012
Junior Member
No Message Body
Re: Egit and Merge issues [message #829532 is a reply to message #761865] Mon, 26 March 2012 08:21 Go to previous messageGo to next message
Paul Shtukov is currently offline Paul Shtukov
Messages: 3
Registered: March 2012
Junior Member
Christian Halstrick wrote on Wed, 07 December 2011 02:53
This is not a problem of having "recursive" merge strategy. As you can see in the output two commits should be merged and jgit has been able to determine a single base commit. In such cases "recursive" is the same as "resolve".

Therefore I guess it's a standard merge problem. E.g. during merge it was found out that the index is dirty (you added stuff before the merge) or that the working tree is dirty (you modified files in the working tree which the merge wants to overwrite.

Look into http: egit.eclipse.org/w/?p=jgit.git;a=blob;f=org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java;hb=master to see how you do merges and especially how to lookup the error causes.


Thank you, Christian for your reply but ... I have not understood anything. What is the algorithm for resolving this problem? How to avoid it?

bugs.eclipse.org/bugs/show_bug.cgi?id=354099

It's very annoying problem, it actualy eliminates "Merge" command in EGit for our project. Hard reset or even deletion and new cloning of repo. doesn't solve it (or solves for a short time).

Hope for your help.

Paul




[Updated on: Mon, 26 March 2012 12:09]

Report message to a moderator

Re: Egit and Merge issues [message #831791 is a reply to message #829532] Thu, 29 March 2012 07:03 Go to previous message
Paul Shtukov is currently offline Paul Shtukov
Messages: 3
Registered: March 2012
Junior Member
Hello there...
Previous Topic:dropping and clearing stashes - coming soon?
Next Topic:Open in Commit Viewer broken in nightly build?
Goto Forum:
  


Current Time: Wed Apr 16 09:40:30 EDT 2014

Powered by FUDForum. Page generated in 0.03090 seconds