Conflicts in removed files

[David Strauss]

On 2009-12-12 07:35, Marius Kruger wrote:
> The config for this can be in .bzr/branch/branch.conf

This sort of configuration should only happen on a file-by-file basis.
It's dangerous to say, even at the branch level, that Bazaar should
silently pick deletion when encountering a remote change to a locally
deleted file.

-- 
David Strauss
   | david at fourkitchens.com
Four Kitchens
   | http://fourkitchens.com
   | +1 512 454 6659 [office]
   | +1 512 870 8453 [direct]

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 259 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20091215/85bd55b7/attachment.pgp