Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » strategy resolve resulted in: Failed
strategy resolve resulted in: Failed [message #786624] Mon, 30 January 2012 16:49 Go to next message
Marc Missing name is currently offline Marc Missing nameFriend
Messages: 18
Registered: March 2011
Junior Member
Hi,

I have a master and a "development" branch, which branches from master.
In master was no commit since the branch and I want to merge the development branch back into master.

Seems to be simple enough, but I get:

Merge of revisions 7434221a533b1b4572838c7d75a782c38b606caf, fd57a12155596c4378d3833c480485ed2eae7e11 with base facf3a2df693d2dc18f1af37ae8bef6851792de1 using strategy resolve resulted in: Failed.

The master is in conflict state after that and I cant resolve it, because the merge tool is grayed out. I have to reset the master to get it all ok again.

I changed a few files and moved a few around to new directories. Nothing fancy, i thought?

What did I wrong?

I tried the stable version and the nightly from this day

I also tried to rebase the branch back into master but got:

Cannot cherry-pick commit '3b4fef6182be88b7db8d9cc709a12a1fc132ace9' because it has 2 parents, only commits with exactly one parent are supported.
Cannot cherry-pick commit '3b4fef6182be88b7db8d9cc709a12a1fc132ace9' because it has 2 parents, only commits with exactly one parent are supported.

Maybe that helps too?

[Updated on: Mon, 30 January 2012 16:52]

Report message to a moderator

Re: strategy resolve resulted in: Failed [message #786636 is a reply to message #786624] Mon, 30 January 2012 17:04 Go to previous messageGo to next message
Christian Halstrick is currently offline Christian HalstrickFriend
Messages: 113
Registered: July 2009
Senior Member
please look carefully at your history: The message "Merge of revisions <x>, <y> with base <z>..." tells that you have two commits you want to merge together (<x> and <y>) which have a third commit (<z>) as their merge-base. From that it can't be true that you branched off from master and that there was no commit on master from that time on.

Maybe attach the output of 'git log --all --oneline --graph --decorate=full' just before you try the merge in egit.


Ciao
Chris
Re: strategy resolve resulted in: Failed [message #786642 is a reply to message #786636] Mon, 30 January 2012 17:10 Go to previous messageGo to next message
Marc Missing name is currently offline Marc Missing nameFriend
Messages: 18
Registered: March 2011
Junior Member
Christian Halstrick wrote on Mon, 30 January 2012 12:04


Maybe attach the output of 'git log --all --oneline --graph --decorate=full' just before you try the merge in egit.


Hmm, how can I do that?

[Updated on: Mon, 30 January 2012 17:16]

Report message to a moderator

Re: strategy resolve resulted in: Failed [message #786652 is a reply to message #786642] Mon, 30 January 2012 17:17 Go to previous messageGo to next message
Marc Missing name is currently offline Marc Missing nameFriend
Messages: 18
Registered: March 2011
Junior Member
I checked my history and base facf3a2df693d2dc18f1af37ae8bef6851792de1 is in it, its a commit after I branched and its in the master branch. Is that not correct?

[Updated on: Mon, 30 January 2012 17:18]

Report message to a moderator

Re: strategy resolve resulted in: Failed [message #786664 is a reply to message #786652] Mon, 30 January 2012 17:30 Go to previous messageGo to next message
Marc Missing name is currently offline Marc Missing nameFriend
Messages: 18
Registered: March 2011
Junior Member
Hmm, I fixed it now:
I merged the master into my branch, resolved 3 conflicts and merged the branch into the master.

But something is wrong here Sad
Re: strategy resolve resulted in: Failed [message #786810 is a reply to message #786664] Mon, 30 January 2012 21:00 Go to previous messageGo to next message
Christian Halstrick is currently offline Christian HalstrickFriend
Messages: 113
Registered: July 2009
Senior Member
Looks like a normal merge conflict to me. When master branch pointed to facf3a2df693d2dc18f1af37ae8bef6851792de1 you created your side branch development from it. Afterwards you developed in "development" which lead to commit 7434221a533b1b4572838c7d75a782c38b606caf. Meanwhile also master advanced ultimatly pointing to fd57a12155596c4378d3833c480485ed2eae7e11. Now you merged "development" into "master" and had to resolved conflicts on files touched in both branches. Looks normal to me.

Ciao
Chris
Re: strategy resolve resulted in: Failed [message #787146 is a reply to message #786810] Tue, 31 January 2012 08:05 Go to previous messageGo to next message
Marc Missing name is currently offline Marc Missing nameFriend
Messages: 18
Registered: March 2011
Junior Member
Hmm, but if I wanted to merge the branch into the master it results in half broken conflict state which I could only resolve to go the other way round with merging the master into branch, resolving the conflict and then merge the branch back to master. Is that normal, ok, I only want to know for further endeavors Wink
Re: strategy resolve resulted in: Failed [message #787231 is a reply to message #787146] Tue, 31 January 2012 10:05 Go to previous message
Christian Halstrick is currently offline Christian HalstrickFriend
Messages: 113
Registered: July 2009
Senior Member
What you describe is not normal, that would be a bug. In general there should be no big difference whether you merge A into B or B into A. The end result, even if the merge results in a conflict, should be very similar. You should see that the same files conflicting and for the non-conflicting files there should be the same content. The main difference between merging A into B versus mering B into A is which branch gets updated with the merge result. In one case we update A and leave B untouched and the other case we update B and leave A untouched. A minor difference between the two cases is for conflicting files which content is OURS and which one is THEIRS.

Long story, but in the end it boils down to: If you really see a difference in conflicts when you merge A into B in contrast to merging B into A then please report it as bug at https://bugs.eclipse.org/bugs/. That would be a severe bug which has to be fixed soon. Make sure that the start situation is exactly the same for the two merges (maybe zip working-tree and repo, try one merge, delete and unzip and try the other merge). Ideal would be if you could attach a zipped repo or point me to a e.g. github repo which I could clone to reproduce.





Ciao
Chris
Previous Topic:JGit: How to get branch from a commit id
Next Topic:branch.master.rebase true not working sometimes
Goto Forum:
  


Current Time: Fri Dec 19 16:39:38 GMT 2014

Powered by FUDForum. Page generated in 0.10203 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software