Creating a branch
Use a branch name prefixed by your name (or your acronym) and a slash, e.g., chw/new-feature.
Updating a branch
Use fetch and rebase.
Merging a branch into the ‘master’
Use fetch and merge.
Making a merge request
- merge the master into your branch
- Resolve conflicts
- Actually, make the merge request