| Name | Type | Description | Notes |
|---|---|---|---|
| strategy | StrategyEnum | Conflict resolution strategy applied when the branch and its base have diverged. `use_main` keeps the values from the base branch; `use_branch` keeps the values from this branch. | [optional] |
| Name | Value |
|---|---|
| MAIN | "use_main" |
| BRANCH | "use_branch" |