[RFC] How to better assist users in resolving conflicts
Matthew D. Fuller
fullermd at over-yonder.net
Wed Jan 13 21:21:29 GMT 2010
On Wed, Jan 13, 2010 at 11:04:08AM +0200 I heard the voice of
Alexander Belchenko, and lo! it spake thus:
>
> One thing that constantly irritate me: why `bzr resolve --auto`
> don't auto mark file path conflict as resolved when I manually
> change the paths (foo vs foo.moved) as needed?
Long-time irritation here too.
https://bugs.launchpad.net/bzr/+bug/138803
Gets REALLY annoying when it's dozens or more conflicts like that (I
had a case a few weeks back like that).
--
Matthew Fuller (MF4839) | fullermd at over-yonder.net
Systems/Network Administrator | http://www.over-yonder.net/~fullermd/
On the Internet, nobody can hear you scream.
More information about the bazaar
mailing list