traduire use "git add <file>..." to mark resolution) code example

Example: merge branch to branch

git checkout master
git merge new-branch
git push