2009/2/20 Junio C Hamano <gitster@xxxxxxxxx>: > John Tapsell <johnflux@xxxxxxxxx> writes: > >> 2009/2/20 Junio C Hamano <gitster@xxxxxxxxx>: >> <snip> >>> $ 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
