how do I continue a merge after resolving conflicts?

[Martin Pool]

On 18 Nov 2005, Jamie Wilkinson <jaq at spacepants.org> wrote:
> This one time, at band camp, Martin Pool wrote:
> >For those following along at home: bzr merge always merges all files,
> >leaving conflicts in those where they occur.  There's no need to do
> >another merge from the same source after you resolve the conflicts --
> >just fix them up and commit.
> 
> So, bzr aggregates all the changesets coming in the merge, and applies it
> once?

The merge isn't really done by applying the changesets one at a time.  A
better way to think of it is that it merges the two trees taking their
history into account.

> Or is it possible that two incoming changesets can conflict with a
> local changeset, and make a mess of the << == >> ?

I don't understand the question, can you expand?

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051118/3558d734/attachment.pgp