How to use Git with this project

Coordinator
Jun 4, 2013 at 8:33 PM
Edited Jun 10, 2013 at 11:36 PM
I've received a few questions regarding the use of Git with this project.
  1. Download & install Git client here
  2. (required) Download & install SourceTree as a stand alone GUI for Git
  3. (optional - recommended) Download & install Visual Studio Tools for Git
  4. Read the first three chapters of the Git documentation http://git-scm.com/doc (available in various languages)
  5. Read "A successful Git branching model" this is how this project will be using Git
  6. To make use of #5 please read Smart branching with SourceTree and Git-flow.
To sum up #5 & #6:
  • All work is done in a branch made off of the develop branch and then merged back into develop when completed; delete the branch the work was done in after merging into develop
  • Bugs that must be fixed immediately are done in a HotFix branch off of the master branch. They will be merged into the master branch and the develop branch and then deleted (the branch that is).
  • the master branch is meant to act as what exists or is about to exist on our server at texashuskyrescue.org
  • when a code cut is ready to be made to go to master a release branch will be created off of develop and then merged into master
Coordinator
Jun 10, 2013 at 11:37 PM
Updated the above post with more information
Coordinator
Jun 10, 2013 at 11:37 PM
Here is another site that has information on using GitFlow - it talks about doing it from the command line which is fine if you do not want to install SourceTree http://danielkummer.github.io/git-flow-cheatsheet/