Re: merging emacs-24

[Andreas Schwab]

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.

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