[Qgis-developer] Branch conflict

[Magnus Homann]

It seems there will be some serious conflict between branches 'renderer' 
and 'composer_redesign' when/if a merger to trunk is done.

The render branch is Tim and myself fixing the render GUI and adding 
rotation and scaling to the renderers. In the 'composer_redesign' branch 
Steven seems to also heaviliy modify the render component.

I'm a bit worried some of these changes will be lost when the branches 
are merged. How can this situation best be resolved?

Magnus