how do I continue a merge after resolving conflicts?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jamie Wilkinson wrote:
> I was trying to differentiate the case where merge iterates over the
> 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.

It's important to understand that the bzr model does not have
changesets.  It uses full-tree snapshots to represent revisions, instead.

So when you're in branch foo and you merge from branch bar, what you're
really doing is merging the working tree for foo with the last-committed
tree in bar.

Essentially, we find a common ancestor of these trees, and run diff3 to
merge the changes for each file.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDfdyX0F+nu1YWqI0RAqihAJ92PpwYwdQPDM6oaSuaTcExy1X8fACdFt9o
IAKMZLx9V3Nkav6fMIXWs/o=
=ep/x
-----END PGP SIGNATURE-----