|
From: | Michael Albinus |
Subject: | Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: | Thu, 28 May 2015 12:05:22 +0200 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Artur Malabarba <address@hidden> writes: > As a general tip. Next time you try to pull and find out someone > already has already done what you just did, don't resolve the merge > conflict. Instead, abort the merge with `git merge --abort` (this will > get you back to the state you had right before the pull), and then > locally revert your commit. Thanks. Will try it. Best regards, Michael.
[Prev in Thread] | Current Thread | [Next in Thread] |