- Benoit has become Developer
- HEAD: 4e5e3dfc01e39
- rebase on proposed_master, we will include it, after review
If merge using pull request is working without conflict it is better to avoid rebasing
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b sevensols-wr_starting_kit_update origin/sevensols-wr_starting_kit_update
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/master git merge --no-ff sevensols-wr_starting_kit_update
Step 4. Push the result of the merge to GitLab
git push origin master
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.