Changes between Version 18 and Version 19 of UsingGitToMaintainGDALWorkflow


Ignore:
Timestamp:
Nov 14, 2011, 3:55:31 PM (12 years ago)
Author:
Even Rouault
Comment:

Add a work of caution how to manage local changes done with GIT and merge with SVN

Legend:

Unmodified
Added
Removed
Modified

  • UsingGitToMaintainGDALWorkflow

    v18 v19  
    7474== Development cycle ==
    7575
     76==> Caution ! : I (E. Rouault) have had problems with the workflow detailed below, especially when there's a conflict between one of your local change in GIT and a change in SVN.
     77The solution seems to create a GIT branch where you do your local changes, and keep your GIT master in sync with SVN. Then you rebase your master on to your local
     78branch, resolve the conflict in it, commit it, and then (forward) merge the branch into master. At that point, you can git svn dcommit. Workflow inspired by
     79http://stackoverflow.com/questions/629048/git-svn-dcommit-error-restart-the-commit
     80
     81
    7682After this step, you maintain your own local repository of GDAL trunk. You can proceed with your own development, make changes and commit them to your local repository.
    7783