Eclipse Community Forums: EGit / JGit

Help

Home

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

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

aborting a merge [message #800878]

Fri, 17 February 2012 16:21

R Shapiro

Messages: 386
Registered: June 2011

Senior Member

I know egit supports aborting a rebase but as far as I know it doesn't support aborting a merge. Is that correct? If so, is there some difficulty that's getting in the way of adding this feature? It's a pretty important part of normal git merge usage, just as it is in rebase.

Report message to a moderator

Re: aborting a merge [message #801395 is a reply to message #800878]

Sat, 18 February 2012 09:52

Robin Rosenberg

Messages: 332
Registered: July 2009

Senior Member

R Shapiro skrev 2012-02-17 17.21:
> I know egit supports aborting a rebase but as far as I know it doesn't support aborting a merge. Is that correct? If so, is there some difficulty that's getting in the way
> of adding this feature? It's a pretty important part of normal git merge usage, just as it is in rebase.

A hard reset should do. Now that is not always the same as git merge --abort in that reset forgets all changes,
while git merge --abort tries to retain changes that were not committed prior to the merge. Not that the
git manual discourages merging when uncommitted changes are present.

-- robin

Report message to a moderator

Re: aborting a merge [message #802970 is a reply to message #801395]

Mon, 20 February 2012 18:58

R Shapiro

Messages: 386
Registered: June 2011

Senior Member

Right, I have that alternative documented in my own egit-notes, and I see now that it's also in the Egit help. For sure I agree it's a bad idea to merge into a branch with uncomitted changes.

Still, an explicit 'abort merge' egit operation seems like it's worth adding, even if the implementation is the same as a hard reset to HEAD (maybe with an additional check for uncommitted changes).

Report message to a moderator

Previous Topic:	JGit
Next Topic:	is HTTP authentication broken again?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Thu Apr 25 00:47:33 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter