tortoisebzr-developers team mailing list archive

[John Arbash Meinel <john@xxxxxxxxxxxxxxxxx>]

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

C. Mundi wrote:
> Hi Mark.
> 
> The first two parts of your question really have no wrong answers.
> Workflows for resolutions will vary, but anything which gives me an option
> to go through each of the files (in any order) and do 3-way merges on each
> would be great.  Actually, now that I think about it... the ability to go
> back and change how I resolved a conflict in one file after resolving a
> conflict in another file (known in technical parlance as "changing my mind"
> <grin>) would be most appreciated.

Well, from the command line we have "bzr remerge" which takes the same
options, so you can do:

bzr merge # use the default algorithm
bzr remerge --weave one-file
bzr remerge --merge3 --show-base another-file
bzr remerge --reprocess forth file
bzr remerge --weave file-that-didn-t-conflict-the-first time

Etc.

I know we also have the "extmerge" plugin. I don't know when and where it
hooks in, but it lets you run a GUI 3-way merger when a file is marked
conflicted (it requires the THIS, BASE, OTHER files).

Someone submitted a bug recently wanting a:

bzr merge --dummy

that would just conflict for all changes, so he could manually resolve
everything his preferred way.

Anyway, I wonder whether this should be "resolve" or "merge" time for this
sort of thing.

John
=:->

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

iD8DBQFIvbpWJdeBCYSNAAMRAjSnAJ9vq3YSY9yZukSP8Ortpd3XP8iyYgCgy7Rh
VImn1DSZwN6aAgFpQWx96yE=
=lOXD
-----END PGP SIGNATURE-----