1 more example for git merge
{{ score }} 
  # Merge the branch 'some_branch' into the current branch without actually touching anything
git merge some_branch -s ours

# Merge the branch 'some_branch' into the current branch, forcing a merge commit
git merge --no-ff some_branch

# Merge the branch 'some_branch' into the current branch, forcing a merge commit, and stopping before actual commit
git merge --no-ff --no-commit some_branch
  Submitted by anonymous user about 10 years ago [permalink]