how do I continue a merge after resolving conflicts?

[Martin Pool]

On 18 Nov 2005, Jamie Wilkinson <jaq at spacepants.org> wrote:
> changesets being merged, applying them one at a time, versus aggregating all
> the changesets into one, and then applying that aggregate once.
> 
> I think now, the latter takes place.  I was concerned in the case of the
> former, it might be possible to construct a conflict such that after the
> first merge, the <<< === >>> markers are placed in the file, and then a
> second changeset could also conflict with that part of the file, potentially
> making a big mess.

That's correct.  If you do a merge, get conflicts, then do another merge
--force you can get a big mess with multiple conflict markers.  It's
possible you could resolve it by hand, and it's even possible in the
future we could make it smarter about inserting n-way conflicts, but for
the moment resolving one at a time seems to be enough.

-- 
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/55d7c07d/attachment.pgp