[Top][All Lists]

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

Re: Having a custom merge process

From: Paul Eggert
Subject: Re: Having a custom merge process
Date: Fri, 25 Dec 2015 23:35:37 -0800
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0

David Engster wrote:
The usual way to deal with this is to have one person who does the
merges ("the Merge Master"), who needs to have a good overview of
development and the used VCS and hence simply knows what to do. The
point of gitmerge.el is that pretty much anyone should be able to do the

For what it's worth, I've done git merges for Emacs both with gitmerge.el and without, and although gitmerge.el is nicer it's not clear that it's worth the trouble. That is, it should be OK to use gitmerge.el to merge, and it should also be OK to not use it. Either way, you need to know what you're doing.

reply via email to

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