Git: Mastering Version Control

Using Git with a Subversion repository

Using Git as a client of Subversion can raise some confusion due to the flexibility of Git as compared to the more rigid way Subversion organizes files. To be sure to maintain a Subversion-friendly way of work, I recommend that you follow some simple rules.

First of all, be sure your Git master branch is related to the trunk branch in Subversion; as we already said, Subversion users usually organize a repository in this way:

• a /trunk folder, which is the main folder
• a /branches root folder, where you put all the branches, each one located in a separate subfolder (for example, /branches/feat-branch)
• a /tags root folder, where you collect all the tags you made (for example, /tags/v1.0.0)

To adhere to this layout, ...