Re: Having a custom merge process

[John Wiegley]

>>>>> David Engster <address@hidden> writes:

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

I'll make a point of getting comfortable with gitmerge.el this weekend, since
I will be acting as that "Merge Master" so others can focus on emacs-25.
However, the ability for others to pick up the process easily is a definite
bonus.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2