I will fix the conflicts and propose merge again. I am new with bzr/launchpad and didn't notice the conflicts.
> This has unrelated changes and does not even compile as it contains merge
> conflicts.
>
> What is it with submitting merge proposals that contain merge conflicts? Of
> course it is a bug that
> bzr and/or launchpad accept them at all, but still, why is this not noticed?
> This is not the first time this happens so obviously (some of) our processes
> need to get fixed.
I will fix the conflicts and propose merge again. I am new with bzr/launchpad and didn't notice the conflicts.
> This has unrelated changes and does not even compile as it contains merge
> conflicts.
>
> What is it with submitting merge proposals that contain merge conflicts? Of
> course it is a bug that
> bzr and/or launchpad accept them at all, but still, why is this not noticed?
> This is not the first time this happens so obviously (some of) our processes
> need to get fixed.