Home/ Questions/Q 3459574
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-18T10:07:21+00:00

I’m experimenting with git-svn , and am trying to come up with a relatively

  • 0

I’m experimenting with git-svn, and am trying to come up with a relatively non error-prone workflow. I think the following should work, and is pretty simple, but I’ve seen people using far more complicated workflows, so I want to see why.

  1. (master) $ git svn init <path>
  2. (master) $ git svn fetch
  3. (master) $ git svn rebase
  4. (master) $ git checkout -b topic-branch
  5. (topic-branch) $ # HACK HACK COMMIT HACK HACK HACK COMMIT HACK COMMIT
  6. (topic-branch) $ git checkout master
  7. (master) $ git merge topic-branch — this is a fast-forward merge, so no merge commit
  8. (master) $ git svn rebase
  9. (master) $ # fix conflicts
  10. (master) $ git svn dcommit
  11. GOTO 4
Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Yes, that’s essentially what I do when working with Subversion repositories. The key to the simplicity of this is to keep the Git branches local and not try to map them to Subversion branches at all.

    I just noticed that you linked directly to my answer in that other question. So perhaps I should explain more. 🙂

    I sometimes do the conflict resolution in the topic branch if I expect some conflict work. Otherwise, if I don’t expect many conflicts, I might merge to master first before doing the git svn rebase. It doesn’t matter much.

    The key point is that Git is so flexible that the minimum workflow is very simple. You’ve added a topic branch to that; I’ve added rebasing on the topic branch.

    • 0