Resolving conflicts with Bazaar Explorer

[Aaron Bentley]

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

David Muir wrote:
> But now what?  The docs aren't very
> clear about this. They say to either edit the main copy of the file or
> by "invoking external tools on the THIS, OTHER, and BASE versions". Do I
> put all the corrections into THIS, then replace the main file with THIS?

Yes, that's the kind of thing they mean.

> Are there other tools that better understand bzr conflict resolution
> that I could use instead of meld?

I'm not aware of any.

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

iEYEARECAAYFAksMuOEACgkQ0F+nu1YWqI1eegCfby2QEaWm2cQmbdldSbDw4UHo
VnYAn38rWJm9P/wqO1f6ZH8gocwFymT/
=S17d
-----END PGP SIGNATURE-----