merge dev_cooperatic into dev_principale
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b dev_cooperatic origin/dev_cooperatic
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout dev_principale git merge --no-ff dev_cooperatic
Step 4. Push the result of the merge to GitLab
git push origin dev_principale
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
mentioned in commit 5a758c56
mentioned in commit 5a758c56
merged
merged
mentioned in commit 348dfa61
mentioned in commit 348dfa61
This will create a new commit in order to revert the existing changes.