Change Git's Merge Strategy

You can choose how you want Git to automatically resolve the merge conflicts that it finds in your branches. In most cases Git can use the merge strategy to resolve the differences between branches.

You can choose from the following Git merge strategies:

Semantic Merge - Use this option to use Semantic Modeler's merge strategy. Semantic Merge merges the model's objects and not just text. Oracle recommends that you use this merge strategy.

Git Merge - Use this option to use Git's default merge strategy. Git's default merge strategy uses a three way algorithm. In cases where there is more than one common ancestor, Git creates a merged tree of the common ancestors and uses it to determine the three way merge.

Ours - Use this option to have Git resolve conflicts by favoring code changes from the branch that you are merging into. This is branch B or the target branch. If you select this option, Git won't use Ours to resolve all merge conflicts, but only when it can't use its default merge strategy to resolve specific conflicts.

Theirs - Use this option to resolve conflicts by favoring code from the branch that you are merging from. This is Branch A or the source branch. If you select this option, Git won't use Theirs to resolve all merge conflicts, but only when it can't use its default merge strategy to resolve specific conflicts.

If Git can't automatically resolve the merge conflicts, then the Merge Conflicts pane is displayed and lists the conflicts that you must resolve manually. See Resolve All Merge Conflicts and Resolve Individual Merge Conflicts.

1. On your home page, click Navigator and then click Semantic Models.
2. In the Semantic Models page, click a semantic model to open it.
3. Click Toggle Git Panel to open the Git pane.
4. Click the Merge tab and go to the Strategy field and select a merge strategy to use when you merge branches.
5. Click Merge.