Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Artur Malabarba]

> - I've pulled from the remote Emacs repository, getting a conflict in
>   tramp.el. Glenn had fixed the problem already, but there are
>   whitespace difference between his and my change.
>
> - I've fixed the conflict in tramp.el, and committed it.

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.