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

[Eli Zaretskii <eliz@gnu.org>]

> Date: Sun, 03 Jan 2010 20:17:44 +0100
> From: Jan Djärv <jan.h.d@swipnet.se>
> CC: emacs-devel@gnu.org
> 
> >> I kind of expected merge to merge changes without me having to check in into
> >> the quickfix branch first.
> >
> > Why do you need that?  It is so easy to uncommit on a local branch
> > that committing there shouldn't be a hard decision.  It's not like you
> > are going to pollute a public repository.
> 
> There is the question of commit logs and Changelogs.  There will be many local 
> logs, and as I understood it from previous discussion, these will all 
> propagate to savannah when I push from trunk.

But pushing from trunk is another operation.  "bzr merge" in the
branch merges latest changes from trunk _into_the_branch_, not the
other way around.  When time comes to merge your branch into mainline,
you should say "bzr merge ../quickfixes" _from_the_trunk_.  Only then
you need to worry about local logs etc.

Or am I missing something?