|
Re: Version Control Systems
Quote:
Originally Posted by mathmogul
Each of our programmers tends to have their own laptop and they each test changes independently. Once each has been tested, changes are pushed to GitHub and merged at the end of the night. One of the more experienced students and I fix conflicts as they arise.
|
We also do this. It's a really nice workflow for what we do, since it can be very modular. People work on literal features, and we merge these features in nicely.
Some related links:
http://nvie.com/posts/a-successful-git-branching-model/
https://www.atlassian.com/git/workflows
__________________
All opinions are my own.
|