Git : appliquer une stratégie de merge différente
Boris HUISGEN September 20, 2015
# git checkout master
# git merge --no-ff release -X theirs
Boris HUISGEN September 20, 2015
# git checkout master
# git merge --no-ff release -X theirs