search

mhagger / git-imerge

Incremental merge for git
GNU General Public License v2.0
2.68k stars 126 forks source link

add a stop, abort, or similar command #189

Open jacob-keller opened 2 years ago

jacob-keller commented 2 years ago

git rebase and git merge both have "--abort" and "--quit" options for stopping a merge. The git imerge tool does not seem to have a similar option or command.

It would be nice if the tool had an analagous way to say "give up for now". It would also help to have documentation that shows how to resume a merge you stopped earlier.

jacob-keller commented 2 years ago

It seems like I can do a "git merge --abort" or "git merge --quit" but it would be good if imerge had this as a command.

waldyrious commented 2 years ago

It would also help to have documentation that shows how to resume a merge you stopped earlier.

You can find that here: https://github.com/mhagger/git-imerge#suspendingresuming

That section also mentions how to abort an imerge, although I agree it could be made more convenient and straightforward.

mhagger commented 2 years ago

I use git imerge remove. But this leaves you in a detached-HEAD state, so you have to follow it up with git checkout SOMEBRANCH. It would be nice if this were a single step, like git imerge abort, though then imerge would have to decide what branch to return you to. I don't remember if it already records that.

waldyrious commented 2 years ago

Oh, by the way, this seems to be a duplicate of #123. WDYT, @jacob-keller?

jacob-keller commented 2 years ago

Yep that looks like a duplicate.