Collaboration Wiki - GoCodingGroup/MultiplicationTable GitHub Wiki

To ensure that collaboration via git works fine with our team we agreed to use a slimmed version of this branching model. If you're unsure how to apply this model using git, this wiki page might help. A short summary of the main ideas in plain english:

• To create a new feature, create a feature-[featurename] branch where you can experiment with the new feature. In a feature branch you should only experiment with one specific feature. Do NOT mix and match. Try to keep commits in the feature branch logical and small. Also try to keep the feature branch local to your own machine but don't feel to bad about pushing it to GitHub to show off your work (just delete it when it's no longer needed as described in step 3)
• Once a feature is finished, compress the commits into a single feature commit and merge into the develop branch.
• Delete the old feature-branch both locally and (if ever pushed) on GitHub.
• To release a new version, merge (using fast-forward) into the master branch and tag the version. Might be a good idea to cryptographically sign this tag.