From: Jason Rumney <jasonr@gnu.org>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: Andreas Schwab <schwab@suse.de>, Emacs-Devel <emacs-devel@gnu.org>
Subject: Re: Merging unicode
Date: Tue, 29 May 2007 23:46:29 +0100 [thread overview]
Message-ID: <465CAD45.5070104@gnu.org> (raw)
In-Reply-To: <f7ccd24b0705291537o252b207cg17c6dac2aed7fb92@mail.gmail.com>
Juanma Barranquero wrote:
> I agree with Jason: the conflicts are the same, the only thing that
> varies is where do they happen and who shoulders the effort.
I disagree that "who shoulders the effort" varies though. The merge
needs collaboration between people familiar with the code in both
branches to figure out how to best solve any problems that come up.
next prev parent reply other threads:[~2007-05-29 22:46 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
2007-05-29 22:52 ` David Kastrup
2007-05-29 22:37 ` Juanma Barranquero
2007-05-29 22:46 ` Jason Rumney [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=465CAD45.5070104@gnu.org \
--to=jasonr@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 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.