From: Jason Rumney <jasonr@gnu.org>
To: David Kastrup <dak@gnu.org>
Cc: Juanma Barranquero <lekktu@gmail.com>,
Emacs-Devel <emacs-devel@gnu.org>,
Andreas Schwab <schwab@suse.de>
Subject: Re: Merging unicode
Date: Tue, 29 May 2007 23:12:07 +0100 [thread overview]
Message-ID: <465CA537.7010601@gnu.org> (raw)
In-Reply-To: <857iqrxpkj.fsf@lola.goethe.zz>
David Kastrup wrote:
> Merging unicode2 first will cause synch headaches in the multitty
> branch (larger than the other way round, presumably).
I don't know why you presume this. The same two versions will be being
merged, and the same conflicts produced. The branch in CVS where the
work takes place to resolve the conflicts is the only variable.
next prev parent reply other threads:[~2007-05-29 22:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-29 15:38 Merging unicode Juanma Barranquero
2007-05-29 17:38 ` Andreas Schwab
2007-05-29 19:01 ` Juanma Barranquero
2007-05-29 21:55 ` David Kastrup
2007-05-29 22:12 ` Jason Rumney [this message]
2007-05-29 22:52 ` David Kastrup
2007-05-29 22:37 ` Juanma Barranquero
2007-05-29 22:46 ` Jason Rumney
2007-05-29 22:54 ` Juanma Barranquero
2007-05-30 4:26 ` Richard Stallman
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=465CA537.7010601@gnu.org \
--to=jasonr@gnu.org \
--cc=dak@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=lekktu@gmail.com \
--cc=schwab@suse.de \
/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).