From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Bzr document unclear. There is no "conflict markers". Date: Sun, 03 Jan 2010 16:59:59 -0500 Message-ID: References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <87aawvi540.fsf@bnikolic.co.uk> Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: ger.gmane.org 1262556033 15876 80.91.229.12 (3 Jan 2010 22:00:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 22:00:33 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bojan Nikolic Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 03 23:00:27 2010 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 1NRYUs-0002BM-Mg for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 23:00:26 +0100 Original-Received: from localhost ([127.0.0.1]:54617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRYUt-0004Cy-0y for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 17:00:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRYUo-0004Cr-MU for emacs-devel@gnu.org; Sun, 03 Jan 2010 17:00:22 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRYUj-0004BG-Tv for emacs-devel@gnu.org; Sun, 03 Jan 2010 17:00:22 -0500 Original-Received: from [199.232.76.173] (port=35270 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRYUj-0004BB-Ow for emacs-devel@gnu.org; Sun, 03 Jan 2010 17:00:17 -0500 Original-Received: from [140.186.70.10] (port=40276 helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRYUj-000571-Dn for emacs-devel@gnu.org; Sun, 03 Jan 2010 17:00:17 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NRYUR-0001UF-Ho; Sun, 03 Jan 2010 16:59:59 -0500 In-reply-to: <87aawvi540.fsf@bnikolic.co.uk> (message from Bojan Nikolic on Sun, 03 Jan 2010 15:24:15 +0000) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:119322 Archived-At: I think it is usually better do the merge first (and resolve any possible conflicts) before making the edits that make up your fix. I find that hard to understand. If you have not yet edited the file, what is there to merge? All you could do is update, right? Is there something I don't understand here?