Some recommendations :
- Master correspond to production
- When commiting a multi-line commit message, add "..." to the end of the first line to indicate there's more to read
- When answering a new issue: create a new branch following this naming pattern
issue-XX_short-keywords-description
- Use
git gui
in order to comit your change in an atomic way (the lowest change) - Never use git pull unless explicit and very good reason
- While code is still in a review process don't rebase your branch on master
- Use gitlab to create a merge request
- Use your local machine to solve conflict (preferably in your favorite editor)
- While rebasing a branch
B
onto master you have to be in branchB
and typegit rebase master
(this will not integrateB
intomaster
) - While merging a branch
B
into master you must be in master and typegit merge B
- Ask for review with a merge request:you will be responsible for integrating into master (privilege rebase upon merge)