Some recommendations :

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