Hi Martin (and others who need to merge changes over) On Mon, May 2, 2011 at 6:22 PM, Martin Dobias <[email protected]> wrote: > > Then I have a question regarding merging stuff from other > repositories. For example customization we have done with Radim is > based on Sourcepole clone, Pirmin's globe work is also based on that > clone. Those are repositories with a different base, so I would expect > that merging will not work automatically. Anyone has some experience > with such use case?
I wrote up a guide[1] on how to migrate your changesets into git from a 'foreign' repo. The process was quite easy for me, hopefully it will be for you too. [1] http://www.qgis.org/wiki/GitMigration If you want to preserve the history of each commit just omit the squash part of the process. Regards Tim -- Tim Sutton - QGIS Project Steering Committee Member (Release Manager) ============================================== Please do not email me off-list with technical support questions. Using the lists will gain more exposure for your issues and the knowledge surrounding your issue will be shared with all. Visit http://linfiniti.com to find out about: * QGIS programming and support services * Mapserver and PostGIS based hosting plans * FOSS Consulting Services Skype: timlinux Irc: timlinux on #qgis at freenode.net ============================================== _______________________________________________ Qgis-developer mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/qgis-developer
