[Qgis-developer] Branch conflict
magnus at homann.se
Mon Jan 7 02:47:15 EST 2008
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?
More information about the Qgis-developer