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: Mon, 04 Jan 2010 11:23:57 -0500 
    For the first edit ever in that branch, you are right.  But once you
    begin working there, the histories of the branch and the trunk
    diverge, so a merge is necessary.

But after you commit your changes from the branch to the trunk,
isn't everything in sync until you start to edit again?
reply via email to
[Prev in Thread] Current Thread [Next in Thread]