- Master branch is only used for new versions. DO NOT MAKE A PULL REQUEST ON THIS BRANCH !
- Develop branch is used when there is a new feature
- For bug fix, there is two kind of bugs:
- Important bugs:
- These bugs may be severe - fixing them is a high priority
- These bugs will have "Important" tag on GitHub
- When fixed, you should create 2 PRs: One targetting the main branch & one targetting the development branch
- Make sure to test rigorously - the changes could be applied in production code fairly soon, buggy code would be disastrous
- Other bugs:
- These bugs will have "Non-Important" tag on GitHub
- When fixed, PR should target "develop" branch
- Important bugs:
- Use minimal commit ! Squash & rebase your changes whenever you edit your PR before submitting ! Don't do like this guy !
- GitHub labels are used to organize PRs, so please avoid tags like
[FIX]
or[IMP]
in the title. (Commits are fine.) - More informations about Squash & rebase here, here or here (french)