check the wiki here for more info on some of the frameworks we're using
code needs to be approved by code-climate
for the git-apprentices that want to (should) use the command line:
here are some useful aliases
###branches
- only one branch per feature
- feature branch name should be:
feature/<feature-name> - bugfix branch name should be:
bugfix/<bug-name> - branch name should be lowercase and english
- start a new branch from master if you start working on something else
####keeping your branch up-to-date to keep your branch up to date with master, you need to rebase it. rebasing is only easy if you do it often
you can rebase your branch by doing the following:
git pull --rebase origin master
if rebasing is not your thing, or your branch has gotten too much out of hand, you can merge master into your branch by doing the following:
git merge origin master
###commits
- only one commit per reasonable change (good example, bad example)
- commit name should say what changed in the commit
- commit name should be lowercase and english
- has a reference to taiga this way if applicable
- explains what is in it
- is only opened when they are done
- is only opened when up-to-date with master
- is only merged when all status checks should pass
- is only merged by an administrator