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" ? So could "git pull/merge" detect if there were local changes, and if there are tell the user something along the lines that they have to either abort the merge, or be unable to abort later? > $ git stash > $ git pull ;# or whatever, try again > ... the same conflict but this time you only need to worry > ... about the merge itself > ... resolve, review, test to convince yourself that your > ... resolution is good and then... > $ git commit > $ git stash pop -- 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
