Intégration des Dev cooperatic (Aide à la commande, Réception avec cache couchDB, possibilité de valider une présence Comité)
{{ 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.
merged
merged
mentioned in commit ad361176
mentioned in commit ad361176
This will create a new commit in order to revert the existing changes.