Skip to content
Nelson Tavares de Sousa edited this page Sep 18, 2015 · 1 revision

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