Step 1.
Fetch and check out the branch for this merge request
git fetch origin
git checkout -b "2496-if-we-use-newsample-without-newdataset-then-nothing-gets-sent-to-data-esrf-fr-4" "origin/2496-if-we-use-newsample-without-newdataset-then-nothing-gets-sent-to-data-esrf-fr-4"
Step 2.
Review the changes locally
Step 3.
Merge the branch and fix any conflicts that come up
git fetch origin
git checkout "1.6.x"
git merge --no-ff "2496-if-we-use-newsample-without-newdataset-then-nothing-gets-sent-to-data-esrf-fr-4"
Step 4.
Push the result of the merge to GitLab
git push origin "1.6.x"
Note that pushing to GitLab requires write access to this repository.
Tip:
You can also checkout merge requests locally by
following these guidelines.
