# `Dagger.ChangesetMergeConflict`
[🔗](https://github.com/dagger/dagger/blob/v0.20.8/sdk/elixir/lib/dagger/gen/changeset_merge_conflict.ex#L2)

Strategy to use when merging changesets with conflicting changes.

# `t`

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

# `fail`

```elixir
@spec fail() :: :FAIL
```

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

# `fail_early`

```elixir
@spec fail_early() :: :FAIL_EARLY
```

Fail before attempting merge if file-level conflicts are detected

# `leave_conflict_markers`

```elixir
@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.

# `prefer_ours`

```elixir
@spec prefer_ours() :: :PREFER_OURS
```

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

# `prefer_theirs`

```elixir
@spec prefer_theirs() :: :PREFER_THEIRS
```

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

---

*Consult [api-reference.md](api-reference.md) for complete listing*