emacs-devel
[Top][All Lists]
Advanced

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

Re: Incorrect merge


From: Andreas Schwab
Subject: Re: Incorrect merge
Date: Fri, 05 Nov 2010 10:30:26 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)

Lars Magne Ingebrigtsen <address@hidden> writes:

> 1) They're a pain in the ass, both to write and due to the constant
> merge conflicts.

git-merge-changelog can help a lot here.

Andreas.

-- 
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]