From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Merging unicode Date: Tue, 29 May 2007 23:46:29 +0100 Message-ID: <465CAD45.5070104@gnu.org> References: <857iqrxpkj.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1180478803 4313 80.91.229.12 (29 May 2007 22:46:43 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 29 May 2007 22:46:43 +0000 (UTC) Cc: Andreas Schwab , Emacs-Devel To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 30 00:46:41 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HtASf-0008Vd-Gn for ged-emacs-devel@m.gmane.org; Wed, 30 May 2007 00:46:41 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HtASf-00058L-4n for ged-emacs-devel@m.gmane.org; Tue, 29 May 2007 18:46:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HtASb-00054V-Bj for emacs-devel@gnu.org; Tue, 29 May 2007 18:46:37 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HtASZ-00052O-Fd for emacs-devel@gnu.org; Tue, 29 May 2007 18:46:36 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HtASZ-00051s-A7 for emacs-devel@gnu.org; Tue, 29 May 2007 18:46:35 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HtASX-0006Dq-T8; Tue, 29 May 2007 18:46:34 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id 3DD015018C; Tue, 29 May 2007 23:46:33 +0100 (BST) User-Agent: Thunderbird 2.0.0.0 (Windows/20070326) In-Reply-To: X-detected-kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:71970 Archived-At: 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.