emacs-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Bzr document unclear. There is no "conflict markers".

From: Richard Stallman
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Sun, 03 Jan 2010 16:59:59 -0500 
    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?
reply via email to
[Prev in Thread] Current Thread [Next in Thread]