[Qgis-developer] Branch conflict

[Tim Sutton]

Hi

In regard to this we should also have a wiki page for each branch
explaining its purpose. I added an index page for branches to the wiki
and also a link to that on the front page in the developer section.

Regards

Tim

2008/1/7, Hugentobler  Marco <marco.hugentobler at karto.baug.ethz.ch>:
> Hi Magnus, Tim, Steven,
>
> A solution could be that you merge the two branches into one and work in the same branch then. Like this you detect code conflicts and/or possibilities for collaboration earlier.
> A disadvantage however could be that one new feature could be ready for merge with trunk before the second one is. In this case, the merge of feature one would be delayed.
> In any case, you should keep each other up to date about your current work to avoid duplication of efforts.
>
> Best regards,
> Marco
>
>
> -----Ursprüngliche Nachricht-----
> Von: qgis-developer-bounces at lists.qgis.org im Auftrag von Magnus Homann
> Gesendet: Mo 07.01.2008 08:47
> An: qgis-developer
> Betreff: [Qgis-developer] Branch conflict
>
> 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
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.qgis.org
> http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
>
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.qgis.org
> http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
>


-- 
Tim Sutton
QGIS Project Steering Committee Member - Release  Manager
Visit http://qgis.org for a great open source GIS
openModeller Desktop Developer
Visit http://openModeller.sf.net for a great open source ecological
niche modelling tool
Home Page: http://tim.linfiniti.com
Skype: timlinux
Irc: timlinux on #qgis at freenode.net