From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Emacs antialiasing in X Date: Sun, 15 Jan 2006 23:28:29 -0500 Message-ID: References: <877j9ya8tu.fsf@boost-consulting.com> <200512220938.jBM9c8Lf021116@coolsville.localdomain> <873bjtoy1i.fsf@boost-consulting.com> <0B2B9218-7271-493B-A60D-F912E09E6E27@swipnet.se> <8764onlsq4.fsf@boost-consulting.com> <87oe2eisl2.fsf@boost-consulting.com> <87irsmkuzh.fsf@emfox.3322.org> <43CA0874.9090706@swipnet.se> <87k6d0exev.fsf@boost-consulting.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1137385732 17696 80.91.229.2 (16 Jan 2006 04:28:52 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 04:28:52 +0000 (UTC) Cc: emacs-devel@gnu.org, Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 05:28:49 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EyLz3-0005Br-Of for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 05:28:46 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyM1K-0006XF-8S for ged-emacs-devel@m.gmane.org; Sun, 15 Jan 2006 23:31:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EyM18-0006X4-GY for emacs-devel@gnu.org; Sun, 15 Jan 2006 23:30:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyM16-0006WB-NO for emacs-devel@gnu.org; Sun, 15 Jan 2006 23:30:53 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyM16-0006W8-KY for emacs-devel@gnu.org; Sun, 15 Jan 2006 23:30:52 -0500 Original-Received: from [206.47.199.166] (helo=simmts8-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyM4Y-0005Rw-Al for emacs-devel@gnu.org; Sun, 15 Jan 2006 23:34:26 -0500 Original-Received: from empanada.home ([67.71.26.73]) by simmts8-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20060116042830.SKCC2202.simmts8-srv.bellnexxia.net@empanada.home>; Sun, 15 Jan 2006 23:28:30 -0500 Original-Received: by empanada.home (Postfix, from userid 502) id 287E270A7D6; Sun, 15 Jan 2006 23:28:30 -0500 (EST) Original-To: David Abrahams In-Reply-To: <87k6d0exev.fsf@boost-consulting.com> (David Abrahams's message of "Sun, 15 Jan 2006 21:09:28 -0500") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (darwin) 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:49161 Archived-At: > I appreciate that you're trying to help (really!) but I don't > understand what you're telling me yet. I'm concerned because there > are merge conflicts in the plain "ChangeLog," etc., files. If I am > going to merge the branches I have to resolve those, don't I? Actually, for such files, you don't have to resolve the conflicts. Just make sure that the complete info about the conflict is kept somewhere so it can be resolved at some point in the future. Someone else can resolve those conflicts for you and you can concentrate on the code itself. Stefan