>>>>> Geoff writes:
> @vila I'll be merging your branch shortly: https://code.launchpad.net/~vila/bzr/tarball-generator/+merge/63557
You didn't need a merge proposal for it, merging it locally is enough. You then push *your* resulting branch and launchpad will update the diff.
« Back to merge proposal
>>>>> Geoff writes:
> @vila I'll be merging your branch shortly: https:/ /code.launchpad .net/~vila/ bzr/tarball- generator/ +merge/ 63557
You didn't need a merge proposal for it, merging it locally is
enough. You then push *your* resulting branch and launchpad will update
the diff.