Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Pull and MERGE_RESOLVED Questions
icon9.gif  Pull and MERGE_RESOLVED Questions [message #983295] Tue, 13 November 2012 15:51 Go to next message
Cesar Casasola is currently offline Cesar Casasola
Messages: 3
Registered: November 2012
Junior Member
I just did the following flow to bring latest changes from server repository

Fetch -> Pull -> Resolve clonflicts manually -> Add to Index -> Commit

So far no problem. EGit work finw.

Now, when I try to bring latest changes get the following error:

Cannot pull into a repository with state: MERGING_RESOLVED

Did I do something wrong?

Report message to a moderator

Re: Pull and MERGE_RESOLVED Questions [message #985793 is a reply to message #983295] Fri, 16 November 2012 03:22 Go to previous messageGo to next message
Stefan Lay is currently offline Stefan Lay
Messages: 327
Registered: July 2009
Senior Member
From your description everything sounds fine - except that you would not need the fetch step or you could do just a merge instead of a pull.

Which version of EGit do you use? There was a bug when the merge commit turned out to be empty, i.e. having no diff after resolving the conflicts: https://bugs.eclipse.org/bugs/show_bug.cgi?id=385924. It was fixed in August and is available with egit 2.1.

Report message to a moderator

Re: Pull and MERGE_RESOLVED Questions [message #986058 is a reply to message #985793] Sat, 17 November 2012 17:39 Go to previous messageGo to next message
Cesar Casasola is currently offline Cesar Casasola
Messages: 3
Registered: November 2012
Junior Member
Stefan Lay wrote on Fri, 16 November 2012 03:22
From your description everything sounds fine - except that you would not need the fetch step or you could do just a merge instead of a pull.

Which version of EGit do you use? There was a bug when the merge commit turned out to be empty, i.e. having no diff after resolving the conflicts: https://bugs.eclipse.org/bugs/show_bug.cgi?id=385924. It was fixed in August and is available with egit 2.1.


I forgot to mention that I use fetch before pull.... I can't pull after fetch because according to EGit my repository was in MERGE_RESOLVED

Report message to a moderator

Re: Pull and MERGE_RESOLVED Questions [message #986309 is a reply to message #983295] Mon, 19 November 2012 15:31 Go to previous messageGo to next message
Cesar Casasola is currently offline Cesar Casasola
Messages: 3
Registered: November 2012
Junior Member
Many times I get this error when I try merge two branch with same parent

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

Report message to a moderator

Re: Pull and MERGE_RESOLVED Questions [message #987049 is a reply to message #986309] Fri, 23 November 2012 03:09 Go to previous message
Stefan Lay is currently offline Stefan Lay
Messages: 327
Registered: July 2009
Senior Member
A merge commit cannot be cherry-picked. This is a missing feature which is tracked in https://bugs.eclipse.org/bugs/show_bug.cgi?id=379007.

Report message to a moderator

Previous Topic:Any way to launch a three-way merge with EGit?
Next Topic:Push and Pull errors
Goto Forum:
  

[ Syndicate this forum (XML) ] [ RSS ]

Current Time: Thu May 23 02:58:37 EDT 2013

Powered by FUDForum. Page generated in 0.01516 seconds