Skip to content
This repository has been archived by the owner on May 23, 2018. It is now read-only.

ncai-developers/programming-club

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

34 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Programming Club 2016-2017

Repository to practice git and github

Members

a list of the members

Basic Repository Procedures

Using this branching model in order to organize all of our changes into branches coming off of development. The basic gist is this:

  • Master is production ready whenever, and should only be changed with a major merge from development.
  • Development is the branch where features, hotfixes, and release branch off from. Making a change involves creating the correct branch, working on it there, then merging it into development and NOT master.

Commit your changes to your branch and merge it into development when you think it's ready to be merged. The rule for merging is to let others approve and merge it, not yoruself.