Dagger.ChangesetMergeConflict (dagger v0.20.8)

Strategy to use when merging changesets with conflicting changes.

Summary

t()

fail()

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

fail_early()

Fail before attempting merge if file-level conflicts are detected

Let git create conflict markers in files. For modify/delete conflicts, keeps the modified version. Fails on binary conflicts.

prefer_ours()

The conflict is resolved by applying the version of the calling changeset

prefer_theirs()

The conflict is resolved by applying the version of the other changeset

@type t() ::
  :FAIL_EARLY | :FAIL | :LEAVE_CONFLICT_MARKERS | :PREFER_OURS | :PREFER_THEIRS

@spec fail() :: :FAIL

Attempt the 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

@spec leave_conflict_markers() :: :LEAVE_CONFLICT_MARKERS

Let git create conflict markers in files. For modify/delete conflicts, keeps the modified version. Fails on binary conflicts.

@spec prefer_ours() :: :PREFER_OURS

The conflict is resolved by applying the version of the calling changeset

@spec prefer_theirs() :: :PREFER_THEIRS

The conflict is resolved by applying the version of the other changeset