bookmark

Git merge strategy options & examples | Atlassian Git Tutorial


Description

git merge -s ours branch1

The Ours strategy operates on multiple N number of branches. The output merge result is always that of the current branch HEAD. The "ours" term implies the preference effectively ignoring all changes from all other branches. It is intended to be used to combine history of similar feature branches.

Preview

Tags

Users

  • @jil

Comments and Reviews