From: Eli Zaretskii <eliz@gnu.org>
To: John Wiegley <jwiegley@gmail.com>
Cc: larsi@gnus.org, dak@gnu.org, emacs-devel@gnu.org
Subject: Re: EWW bugs should be fixed on emacs-25 branch
Date: Fri, 25 Dec 2015 22:00:51 +0200 [thread overview]
Message-ID: <83y4cijo24.fsf@gnu.org> (raw)
In-Reply-To: <m2d1tujoao.fsf@newartisans.com> (message from John Wiegley on Fri, 25 Dec 2015 11:55:43 -0800)
> From: John Wiegley <jwiegley@gmail.com>
> Cc: dak@gnu.org, larsi@gnus.org, emacs-devel@gnu.org
> Date: Fri, 25 Dec 2015 11:55:43 -0800
>
> Anyway, I guess what I mean to say is: I think gitmerge.el might be trying to
> do things that Git itself would handle for us.
Maybe so, but better be safe than sorry. Given the number of times I
saw Git experts here make mistakes about what does and doesn't work, I
will trust gitmerge.el and our experience more than I trust what we
think we know about Git. Also, gitmerge.el should DTRT no matter
which version of Git is installed (I hear that some systems still have
Git 1.7.1 or something like that).
next prev parent reply other threads:[~2015-12-25 20:00 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83y4cijo24.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=dak@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jwiegley@gmail.com \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.