Breezy

  1. Bug #842575
  2. Comment #3

Comment 3 for bug 842575

Revision history for this message
Vincent Ladeuil (vila) wrote :

'bzr resolve --all' is evil, it only get rid of the conflicts and remove the associated helpers (.BASE, .THIS, .OTHER or whatever).

The really evil part is that 'bzr resolve --all --take-other' does what you expect: resolve the conflict by taking the 'OTHER' version.

This is related to bug #344013 and bug #389396 and there is also a FIXME in bzrlib/conflicts.py (wrongly mentioning bug 383396, that's a typo).

This bug is not really a duplicate so I leave it alone.