Cf [question](https://www.developpez.net/forums/d1772459/general-developpement/alm/usine-logicielle/scm/git/gerer-git-pull-conflits/).
Cf question.