Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » aborting a conflicted merge
aborting a conflicted merge [message #753852] Sat, 29 October 2011 10:06 Go to next message
R Shapiro is currently offline R Shapiro
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 10:44 Go to previous message
Robin Rosenberg is currently offline Robin Rosenberg
Messages: 317
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
Previous Topic:How to change the location of the system configuration file?
Next Topic:Potential Locking Issue on Project Import
Goto Forum:
  


Current Time: Tue Jul 22 11:39:17 EDT 2014

Powered by FUDForum. Page generated in 0.01586 seconds