I'm not sure, but I think this is no correct way to do a merge... show diff and conflic.
I think is better to do other branch, something like this: - First save your code and delete this branch in launchpad. - bzr branch lp:avanzosc/mrp-6.1 - bzr push lp:~xclude/avanzosc/mrp-6.1 - update only code for merge - bzr -m "your commit message" - bzr push lp:~xclude/avanzosc/mrp-6.1 and then try to merge... if you know a better way or I'm wrong please tell me how to do it and wy merge generated this diff -- https://code.launchpad.net/~xclude/avanzosc/mrp-6.1/+merge/129684 Your team Avanzosc Developers is subscribed to branch lp:avanzosc/mrp-6.1. -- Mailing list: https://launchpad.net/~avanzosc Post to : [email protected] Unsubscribe : https://launchpad.net/~avanzosc More help : https://help.launchpad.net/ListHelp
