Re: Having a custom merge process

[Paul Eggert]

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
> merge.

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.