We’re looking to implement a pilot of Git to familiarize the team with the tool and introduce them to the more flexible workflow that Git supports over SVN. Because we support concurrent lines of development, we would like to forego the usual way of using git with SVN (each developer clones a branch of the repository and commits there) and try to implement a pure git experience using an intermediate “project repository”. The idea behind this repository is as follows:
- We clone the main subversion repository using git svn
- An empty project repository is created on the server and the Subversion clone is pushed to this repository (its an additional remote).
- The development team clones the project repository and proceeds to do development in their own clones. Periodic pushes to and pulls from the project repository keeps each developers master branch up to date, from which they can rebase their local branches.
- Periodically (probably daily), the originating SVN clone is ’svn rebased’ and the new changes pushed to the project repository. These changes will be pulled by the developers on the next pull from the project repository.
In picture form, the workflow looks something like this:
Nevermind – StackOverflow ruined it for me.
{ 0 comments }