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

1. merge the master into your branch
2. Resolve conflicts
3. Actually, make the merge request