> The removed/added problem is because Rodolfo initially deleted them, but then
> put them back based on my earlier comment. Unfortunately I don't know of a
> way to fix this.
The way I usually solve this (if the history of the branch is not terribly
relevant) is to create a patch from the branch, apply the patch to the trunk,
and push it to a new branch. This loses the history in the branch, but gets
better diff in the history of the trunk.
Your team Zorba Coders is subscribed to branch lp:zorba.
Mailing list: https://launchpad.net/~zorba-coders
Post to : email@example.com
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp