Skip to content

Latest commit

 

History

History
21 lines (10 loc) · 529 Bytes

File metadata and controls

21 lines (10 loc) · 529 Bytes

BranchMergeParameters

Properties

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 the branch being merged. [optional]

Enum: StrategyEnum

Name Value
MAIN "use_main"
BRANCH "use_branch"