[fpc-devel] Need advice for refactoring

[Juha Manninen]

Hi

If merging the rapidly diverging branches becomes a real problem, and if Git 
really can merge so much better (which I haven't compared much myself), you 
can always use a local Git repository, then commit and merge (actually rebase) 
there. Like:
  git checkout DoDi_branch
  ... edit ... git commit
  git rebase master

and then synchronize with git-svn link.

I am doing it with Lazarus development. See my instructions here:
  http://wiki.lazarus.freepascal.org/Lazarus_git-svn

I synchronize with trunk only.
You would need to configure git-svn link for 2 branches, trunk for pull-only, 
DoDi_branch for push.

Juha