-
Guillaume Melquiond authored
These attributes have no effect by themselves. You have to type the following command first: git config --global merge.ours.driver true
63c3a344
La mise à jour de gitlab est terminée. Nous sommes désormais en version 16.11.1
Merci de consulter la release note:
https://about.gitlab.com/releases/2024/04/18/gitlab-16-11-released/
These attributes have no effect by themselves. You have to type the following command first: git config --global merge.ours.driver true