Eclipse Community Forums: EGit / JGit » Pull and MERGE

Help

Home

Home » Eclipse Projects » EGit / JGit » Pull and MERGE_RESOLVED Questions

Show: Today's Messages :: Show Polls :: Message Navigator

Pull and MERGE_RESOLVED Questions [message #983295]

Tue, 13 November 2012 20:51

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 08:22

Stefan Lay

Messages: 342
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 22:39

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 20:31

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