[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Jan Djärv
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Mon, 04 Jan 2010 01:14:19 +0100
User-agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; sv-SE; rv: Gecko/20091204 Thunderbird/3.0

Eli Zaretskii skrev 2010-01-03 20.25:
Date: Sun, 03 Jan 2010 20:17:44 +0100
From: Jan Djärv<address@hidden>
CC: address@hidden

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?

Probably not. There has been so much discussion about workflows and such so it is a bit confusing. I'll just see what happens when the time comes.

        Jan D.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]