Dagger.PatchConflict (dagger v1.0.0-beta.11)

Copy Markdown View Source

How to handle patch hunks that no longer apply to the target content.

Summary

Types

t()

Functions

fail()

Fail the operation if any part of the patch does not apply.

leave_conflict_markers()

Apply the hunks that fit and insert conflict markers where hunks no longer match, instead of failing.

Types

t()

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

Functions

fail()

@spec fail() :: :FAIL

Fail the operation if any part of the patch does not apply.

leave_conflict_markers()

@spec leave_conflict_markers() :: :LEAVE_CONFLICT_MARKERS

Apply the hunks that fit and insert conflict markers where hunks no longer match, instead of failing.