Bazaar

  1. Bug #232512
  2. Comment #1

Comment 1 for bug 232512

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 232512] [NEW] Command line tool for resolving all conflicts in favor of 'merge-source'

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

Jonathan Lange wrote:
> Public bug reported:
>
> It would be really nice if Bazaar had a way to resolve all conflicts in
> favour of 'merge-source' or 'tree'. This is useful when you get a lot of
> spurious conflicts due to criss-cross merges.

I fear that such a command would be misused more often than it was used
correctly. If you're using --lca or --weave, you shouldn't get any
spurious conflicts.

However, revert can do this:
bzr revert -r -1:../merge-source $(bzr conflicts --text)

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

iD8DBQFIVryf0F+nu1YWqI0RAjy+AJ45oCTkm9LXWWcqP83igx47DAxpuwCePOip
asg1GPj04EFOLUe/k+HSF7w=
=0lMH
-----END PGP SIGNATURE-----