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.
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?
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.