Conflict resolution workflow (was Re: Recipes vs. Looms vs. pipelines)

[John Arbash Meinel]

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

Martin (gzlist) wrote:
> On 18/12/2009, Alexander Belchenko <bialix at ukr.net> wrote:
>> Maybe `bzr remerge FILE` will help there?
> 
> Ha, yes, it probably would have. Bazaar has a lot of features I seldom
> need that I forget about when I do want them... I think I'd committed
> the merge and uncommitted it which might have complicated things a
> little more, but remerge would still have been easier.
> 
> Martin
> 
> 

I'm pretty sure you can run "bzr remerge" after you've done uncommit,
because remerge can see the pending parent.

I'm not sure what happens if you conflated things further, (like
uncommitting multiple merges, etc.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksq39QACgkQJdeBCYSNAAOdXQCgniiDTAqEodSo6H2PJimDoLAZ
HcYAnjjinFF8EMH4MB0pdL4tURS1J4Ci
=zW4F
-----END PGP SIGNATURE-----