[Top][All Lists]

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

Re: merging emacs-24

From: Andreas Schwab
Subject: Re: merging emacs-24
Date: Thu, 27 Nov 2014 18:59:16 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)

David Engster <address@hidden> writes:

> Ted Zlatanov writes:
>> I can't believe I did that.  Sorry.  It's not harmful, but I was
>> careless.  I've now added this alias to my gitconfig:
> I think the easiest way to avoid this is to merge the remote branch
> instead of the local tracking one.

That should always be done anyway, since that makes sure you only merge
things that are already pushed.


Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

reply via email to

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