Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » aborting a conflicted merge
aborting a conflicted merge [message #753852] Sat, 29 October 2011 14:06 Go to next message
R Shapiro is currently offline R ShapiroFriend
Messages: 386
Registered: June 2011
Senior Member
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 14:44 Go to previous messageGo to next message
Robin Rosenberg is currently offline Robin RosenbergFriend
Messages: 332
Registered: July 2009
Senior Member
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 15:07 Go to previous messageGo to next message
Alcemir Santos is currently offline Alcemir SantosFriend
Messages: 19
Registered: July 2012
Junior Member

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 22:11 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 811
Registered: July 2009
Senior Member
no, maybe you want to contribute this ?
Previous Topic:Does jgit support auto gc?
Next Topic:Cannot import (local) Git repository
Goto Forum:
  


Current Time: Thu May 05 14:23:02 GMT 2016

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

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