Eclipse Community Forums: EGit / JGit » aborting a conflicted merge

Home » Eclipse Projects » EGit / JGit » aborting a conflicted merge

aborting a conflicted merge [message #753852]

Sat, 29 October 2011 10:06

Eclipse User

From what I can see egit doesn't have a direct equivalent of 'git merge --abort'. I see an abort option for egit rebase but not egit merge. Am I not looking in the right place or does it not exist?

I can use egit reset to abort a conflicted merge but the result is not always identical to what 'git merge --abort' would do.

Re: aborting a conflicted merge [message #753909 is a reply to message #753852]

Sun, 30 October 2011 10:44

Eclipse User

R Shapiro skrev 2011-10-29 16.0616:
> From what I can see egit doesn't have a direct equivalent of 'git merge --abort'. I see an abort option for egit rebase but not egit merge. Am I not looking in the right
> place or does it not exist?
>
> I can use egit reset to abort a conflicted merge but the result is not always identical to what 'git merge --abort' would do.
>

It does not exist (yet).

-- robin

Re: aborting a conflicted merge [message #1728583 is a reply to message #753909]

Tue, 05 April 2016 11:07

Eclipse User

More than 4 year have gone now, have this already been implemented?

Re: aborting a conflicted merge [message #1729410 is a reply to message #1728583]

Wed, 13 April 2016 18:11

Eclipse User

no, maybe you want to contribute this ?

Re: aborting a conflicted merge [message #1732046 is a reply to message #1729410]

Thu, 12 May 2016 04:34

Eclipse User

Matthias Sohn wrote on Wed, 13 April 2016 18:11

no, maybe you want to contribute this ?

I can try, I will start to study the code to learn how to do that.

In the mean time, how can I work around this? I mean, since I tried to execute a merge and it ran into conflicts, how to undo the merge attempt in order to be able to proceed with other operations with the repository?

Re: aborting a conflicted merge [message #1732093 is a reply to message #1732046]

Thu, 12 May 2016 09:55

Eclipse User

I tried to run git merge --abort with Runtime.exec() but it ends with the following message:
Quote:

error: Entry '<filename>' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'HEAD'.

This is what I have tried:

// Option 1
static final String ABORT_CMD = "git merge --abort";
static final String[] ABORT_ENV = { "GIT_PAGER=cat" };
Runtime run = Runtime.getRuntime();
Process pr = run.exec(ABORT_CMD, ABORT_ENV, repositoryPath);
pr.waitFor();

// Option 2
ProcessBuilder pb =  new ProcessBuilder("git", "merge", "--abort");
pb.directory(repositoryPath);
Process pr = pb.start();
pr.waitFor();

In both ways, I have got the same message.

Re: aborting a conflicted merge [message #1732149 is a reply to message #1732093]

Thu, 12 May 2016 18:01

Eclipse User

you can workaround by resetting hard to the commit you started the merge from

Re: aborting a conflicted merge [message #1732194 is a reply to message #1732149]

Fri, 13 May 2016 07:38

Eclipse User

It seems to have worked for my purpose.
I had already tried this but without setref() to such commit.

by the way, would u mind to explain the difference between both approaches ("git reset <sha1>" and "git merge --abort")? I have found this, which left me wondering whether the latter is an alias for the first one or not.

Previous Topic:	Can't Merge into master
Next Topic:	Accessing the conflicting lines

Goto Forum:

-=] Back to Top [=-

Current Time: Wed Jul 23 16:22:41 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter