emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git pull fails with merge conflicts. How can this possibly happen?


From: Eli Zaretskii
Subject: Re: git pull fails with merge conflicts. How can this possibly happen?
Date: Sat, 15 Nov 2014 13:30:29 +0200

> From: David Kastrup <address@hidden>
> Date: Sat, 15 Nov 2014 12:19:09 +0100
> 
> I'd recommend that you keep away from @~n if you don't want to confuse
> other Emacs users.  HEAD~n will be more meaningful to people.

It's a lot more to type, though.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]