Bzr merge problem

[Max Bowsher]

On 17/12/10 16:24, Trent Johnson wrote:
> Max, Eli, thanks for your help!
> 
> Max, your solution worked. Now I have to do a bit of reading to find out why :)

The key to understanding why it works is that by committing the metadata
associated with a merge, but having reverted all the file changes
involved, you are telling Bazaar "I acknowledge that that change
happened, but going forward I want my branch to not include it / undo it
if it has already happened".

Max.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20101217/5e7c070b/attachment.pgp