YAML for Git Merge

View as Markdown

Merge a branch into the current branch in the pipeline filesystem.

YAML parameters for Git Merge

PARAMETERS

branchrequiredstring

The source branch to merge into the current branch.

typerequiredstring

Value: GIT_MERGE

actionrequiredstring

Unique identifier for the action within the pipeline.

conflict_strategystring enum

The strategy for handling merge conflicts. Default: FAIL.

Allowed enum:

FAIL,

OURS,

THEIRS

dry_runboolean

Set to true to only check if the merge is possible without actually performing it.

no_fast_forwardboolean

Set to true to always create a merge commit even if a fast-forward merge is possible.

commiter_emailstring

The email address of the committer used in the merge commit.

commit_messagestring

The custom commit message for the merge commit.

trigger_timestring enum

Specifies when the action should be executed.

Allowed enum:

ON_EVERY_EXECUTION,

ON_FAILURE,

ON_BACK_TO_SUCCESS,

ON_WARNING,

ON_WAIT_FOR_APPROVE,

ON_TERMINATE

loopstring[]

The list of variables for dynamic action execution. The action runs once for each value.

run_only_on_first_failureboolean

When true, the action runs only on the first failure instead of on each failure. Used only when trigger_time is ON_FAILURE.

disabledboolean

When set to true the action is disabled. By default it is set to false.

timeoutinteger

The timeout in seconds. It cannot exceed the action time limit of the workspace plan; a higher value is rejected.

ignore_errorsboolean

If set to true the execution will proceed, mark action as a warning and jump to the next action. Doesn't apply to deployment actions.

retry_intervalinteger

Delay time between auto retries in seconds.

retry_countinteger

Number of retries if the action fails.

Constraints: ≤ 10

run_nextstring enum

Defines whether the action should run in parallel with the next one.

Allowed enum:

WAIT_ON_SUCCESS,

IN_SOFT_PARALLEL,

IN_HARD_PARALLEL

trigger_conditionsTriggerConditionYaml[]

The list of trigger conditions to meet so that the action can be triggered.

variablesVariableYaml[]

The list of variables you can use in the action.

Last modified on Nov 2, 2026

Ghost Inspector CLI Git Push

YAML examples for Git Merge

Full configuration

yaml

- action: "Merge develop into main"
  type: "GIT_MERGE"
  branch: "develop"
  conflict_strategy: "THEIRS"
  dry_run: false
  no_fast_forward: true
  commiter_email: "deployer@example.com"
  commit_message: "Merge develop into main"

Minimal configuration

yaml

- action: "Merge feature branch"
  type: "GIT_MERGE"
  branch: "feature/my-feature"