Notes for developers

Recommended Workflow

  • git clone ssh:///cvs/projects/canvas
    • you should autoamatically be on the develp branch
    • if not, issue this command
      • git checkout develop
  • git checkout -b <my temporary working branch>
  • make all the changes you want and commit them on this branch
  • once you are done working on this set of changes
  • git checkout develop
  • git merge <my temporary working branch>
  • git push origin develop
  • git branch -d <my temporary working branch>

Never work off the master branch. Only tagged releases go directly on the master branch. In general, the develop branch will be ahead of the master branch.