From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Abrahams Newsgroups: gmane.emacs.devel Subject: Re: Emacs antialiasing in X Date: Mon, 16 Jan 2006 08:32:58 -0500 Message-ID: <871wz8e1rp.fsf@boost-consulting.com> 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 1137433063 9280 80.91.229.2 (16 Jan 2006 17:37:43 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 17:37:43 +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 18:37:38 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 1EyYHN-0007js-LS for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 18:36:29 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyYJf-0007NB-V3 for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 12:38:52 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EyVgp-0008PR-CY for emacs-devel@gnu.org; Mon, 16 Jan 2006 09:50:35 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyVgn-0008Ov-6j for emacs-devel@gnu.org; Mon, 16 Jan 2006 09:50:34 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyUWr-0002WQ-48 for emacs-devel@gnu.org; Mon, 16 Jan 2006 08:36:14 -0500 Original-Received: from [207.172.4.62] (helo=smtp02.mrf.mail.rcn.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyUaN-0002rg-13 for emacs-devel@gnu.org; Mon, 16 Jan 2006 08:39:51 -0500 Original-Received: from 209-150-60-201.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com (HELO localhost.localdomain.boost-consulting.com) ([209.150.60.201]) by smtp02.mrf.mail.rcn.net with ESMTP; 16 Jan 2006 08:33:49 -0500 X-IronPort-AV: i="3.99,371,1131339600"; d="scan'208"; a="195468050:sNHT25090532" Original-To: Stefan Monnier In-Reply-To: (Stefan Monnier's message of "Sun, 15 Jan 2006 23:28:29 -0500") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) 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:49173 Archived-At: Stefan Monnier writes: >> 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. That's a huge relief, thanks. -- Dave Abrahams Boost Consulting www.boost-consulting.com