From: Paul Eggert <eggert@cs.ucla.edu>
To: David Engster <deng@randomsample.de>, Lars Ingebrigtsen <larsi@gnus.org>
Cc: emacs-devel@gnu.org
Subject: Re: Having a custom merge process
Date: Fri, 25 Dec 2015 23:35:37 -0800 [thread overview]
Message-ID: <567E4349.9020806@cs.ucla.edu> (raw)
In-Reply-To: <87mvsy84gj.fsf@isaac.fritz.box>
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.
next prev parent reply other threads:[~2015-12-26 7:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-25 7:52 EWW bugs should be fixed on emacs-25 branch Eli Zaretskii
2015-12-25 8:06 ` Eli Zaretskii
2015-12-25 8:26 ` David Kastrup
2015-12-25 14:18 ` Eli Zaretskii
2015-12-25 16:58 ` John Wiegley
2015-12-25 17:15 ` Eli Zaretskii
2015-12-25 17:23 ` John Wiegley
2015-12-25 19:41 ` Eli Zaretskii
2015-12-25 19:55 ` John Wiegley
2015-12-25 20:00 ` Eli Zaretskii
2015-12-25 20:09 ` John Wiegley
2015-12-25 20:40 ` Eli Zaretskii
2015-12-25 20:44 ` John Wiegley
2015-12-25 20:48 ` Eli Zaretskii
2015-12-25 20:53 ` John Wiegley
2015-12-25 23:18 ` David Engster
2015-12-25 23:35 ` Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) John Wiegley
2015-12-25 23:40 ` Having a custom merge process Lars Ingebrigtsen
2015-12-25 23:59 ` David Engster
2015-12-26 0:47 ` John Wiegley
2015-12-26 7:35 ` Paul Eggert [this message]
2015-12-26 9:47 ` Eli Zaretskii
2015-12-26 9:44 ` Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) Eli Zaretskii
2015-12-26 17:00 ` EWW To Elpa? Re: Having a custom merge process raman
2015-12-26 17:51 ` Lars Ingebrigtsen
2015-12-26 21:06 ` Artur Malabarba
2015-12-28 21:17 ` John Wiegley
2015-12-26 18:40 ` Artur Malabarba
2015-12-27 16:29 ` raman
2015-12-27 2:52 ` Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) Richard Stallman
2015-12-27 3:49 ` Eli Zaretskii
2015-12-25 16:07 ` EWW bugs should be fixed on emacs-25 branch Lars Ingebrigtsen
2015-12-25 16:21 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=567E4349.9020806@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=deng@randomsample.de \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).