From: Jason Rumney <jasonr@gnu.org>
To: Thien-Thi Nguyen <ttn@gnuvola.org>
Cc: Nick Roberts <nickrob@snap.net.nz>, rms@gnu.org, emacs-devel@gnu.org
Subject: Re: [pixel@mandriva.com: segfault on buggy .gif + patch to fix it]
Date: Fri, 07 Sep 2007 13:42:59 +0100 [thread overview]
Message-ID: <46E14753.1060104@gnu.org> (raw)
In-Reply-To: <87zlzy69sl.fsf@gnuvola.org>
Thien-Thi Nguyen wrote:
> is this "miles-automatic" or machine-automatic?
> if the former, i don't mind reducing the burden
> a little for miles (if miles doesn't mind).
>
If there are no conflicts (and arch is supposed to be better than CVS at
tracking merge history to minimize conflicts) then it should be
machine-automatic with little input needed from Miles. I always leave it
to the automatic merging on the assumption that manual changes are more
likely to cause spurious conflicts than just leaving it.
next prev parent reply other threads:[~2007-09-07 12:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-07 6:31 [pixel@mandriva.com: segfault on buggy .gif + patch to fix it] Richard Stallman
2007-09-07 7:11 ` Thien-Thi Nguyen
2007-09-07 7:39 ` Nick Roberts
2007-09-07 10:37 ` Thien-Thi Nguyen
2007-09-07 12:42 ` Jason Rumney [this message]
2007-09-07 15:31 ` Davis Herring
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=46E14753.1060104@gnu.org \
--to=jasonr@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=nickrob@snap.net.nz \
--cc=rms@gnu.org \
--cc=ttn@gnuvola.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.