Dagger.ChangesetsMergeConflict (dagger v0.20.7)

Strategy to use when merging multiple changesets with git octopus merge.

Summary

t()

fail()

Attempt the octopus merge and fail if git merge fails due to conflicts

fail_early()

Fail before attempting merge if file-level conflicts are detected between any changesets

@type t() :: :FAIL_EARLY | :FAIL

@spec fail() :: :FAIL

Attempt the octopus merge and fail if git merge fails due to conflicts

@spec fail_early() :: :FAIL_EARLY

Fail before attempting merge if file-level conflicts are detected between any changesets