récupérer un engagement fusionné Git
git checkout -b remerge master
git merge branch -s ours
Yawning Yacare
git checkout -b remerge master
git merge branch -s ours