|
|
10 recommendations I remember:
|
|
|
|
|
|
1. Master correspond to production
|
|
|
1. When commiting a multi-line commit message, add "..." to the end of the first line to indicate there's more to read
|
|
|
1. When answering a new issue: create a new branch following this naming pattern `issue-XX_short-keywords-description`
|
|
|
1. Use git gui in order to comit your change in an atomic way (the lowest change)
|
|
|
1. **Never** use git pull unless explicit and very good reason
|
|
|
1. While code is still in a review process don't rebase your branch on master
|
|
|
1. Use gitlab to create a merge request
|
|
|
1. Use your local machine to solve conflict (preferably in your favorite editor)
|
|
|
1. 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`
|
|
|
1. 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`)
|
|
|
1. While merging a branch `B` into master you must be in master and type `git merge B`
|
|
|
1. Ask for review with a merge request:you will be responsible for integrating into master (privilege rebase upon merge) |
|
|
\ No newline at end of file |