| | 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. |
| | 77 | The 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 |
| | 78 | branch, 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 |
| | 79 | http://stackoverflow.com/questions/629048/git-svn-dcommit-error-restart-the-commit |
| | 80 | |
| | 81 | |
