Difference between revisions of "Demiurge Development Guidelines"
From IridiaWiki
Jump to navigationJump to search (Created page with "== General rules == # Don't talk the git club # Useful commit messages are required, (at least on master branches, or when merging to it) # Never commit directly to the master...") |
|||
| Line 1: | Line 1: | ||
== General rules == |
== General rules == |
||
| − | # Don't talk the git club |
+ | # Don't talk about the git club |
# Useful commit messages are required, (at least on master branches, or when merging to it) |
# Useful commit messages are required, (at least on master branches, or when merging to it) |
||
# Never commit directly to the master branch |
# Never commit directly to the master branch |
||
Revision as of 14:29, 18 September 2019
General rules
- Don't talk about the git club
- Useful commit messages are required, (at least on master branches, or when merging to it)
- Never commit directly to the master branch
- Bug fixes should be done in the dev branch
- New developments should be done in your own branch (branching from the dev branch)
- When development is finished and your code is stable merge your branch into the dev branch
- Make sure your commit history is clean before merge into the dev branch (git rebase -i is your friend)
- After merging, delete any useless branch
- The master branch will be updated regularly based on the dev branch
