Scenario: There is a private Subversion repository that is the primary repository for a project. I still need to push, and pull, from that repo, while also using a remote Github repo as the primary place to save ongoing work, issues, etc.
- Subversion repo uses a non-standard layout; No trunk, no branches.
- Git repo uses a modified version of git-flow.
- The
master branch is a mirror of the Subversion repo. Never commit to that directly. Or, if I do, I immediate do git svn dcommit before makign topic branches.
- Topic branches for features and bug-fixes, off of master.