"MultiplicationTable" is an educational game project utilising Kinect to combine learning for school with excercising and thus making it fun for its young target audience. Right now it primarily focuses on teaching the multiplication table up to 10 * 10. The core gameplay mechanic is jumping on moving bubbles.
Every commit on master will stay there forever from now on. Once pushed there should be no necessity for changing any content of the commit, and if there really is, a separate new commit must be pushed.
I suggest the following scheme for collaborating with git (If we all agree on this we can put this in wiki):
Keep commits locally for as long as is possible, compress them into logical commit blocks when pushing to master (F.e. if you have "Work in Progress" commits for a feature, merge them all into the commit that actually adds said feature).
Make a separate branch if experimental™ code has to be shared/looked at by others/needs to be uploaded for a meeting:
git checkout -b
git push -u origin
If we decide to merge an experimental™ change with the master branch, the following procedure should avoid mess:
git checkout <experimental™_branch_name>
git rebase -i origin/master; // Clean up commits in this step aswell
merge/push to master afterwards
Note: experimental™ is reserved as a branch name for this repo by @DominikHorn as long as this currently existing branch is not deleted/merged. This has nothing to do with being lazy when typing git branch names. All Rights Reserved.
Every commit on master will stay there forever from now on. Once pushed there should be no necessity for changing any content of the commit, and if there really is, a separate new commit must be pushed. I suggest the following scheme for collaborating with git (If we all agree on this we can put this in wiki):
Note: experimental™ is reserved as a branch name for this repo by @DominikHorn as long as this currently existing branch is not deleted/merged. This has nothing to do with being lazy when typing git branch names. All Rights Reserved.