John Tapsell [off-list ref] writes:
2009/2/20 Junio C Hamano [off-list ref]:
<snip>
quoted
$ edit ;# unrelated local changes are still here
$ git pull ;# or merge or whatever
... oops, large conflict ...
... look and see if it can easily be resolved ...
... otherwise
$ git merge --abort
Can I just confirm - at this stage, "git merge --abort" would be a
"git reset --hard HEAD" ?
Not at all. Please re-read my previous message that begins with "Not at
all".
2009/2/20 Junio C Hamano [off-list ref]:
John Tapsell [off-list ref] writes:
quoted
2009/2/20 Junio C Hamano [off-list ref]:
<snip>
quoted
$ edit ;# unrelated local changes are still here
$ git pull ;# or merge or whatever
... oops, large conflict ...
... look and see if it can easily be resolved ...
... otherwise
$ git merge --abort
Can I just confirm - at this stage, "git merge --abort" would be a
"git reset --hard HEAD" ?
Not at all. Please re-read my previous message that begins with "Not at all".
Doh sorry. Yeah it has to be that long algorithm that you outlined.
Can it be done with a series of currently existing commands? Can I
persuade someone else to implement it ? :-)
John