Meziantou.FrameworkTextMergeChunkKind Enum
Specifies how a chunk of a three-way merge was resolved.
public enum TextMergeChunkKindFields
| Name | Value | Description |
|---|---|---|
Unchanged | 0 | Neither side changed the chunk. |
ChangedInOurs | 1 | Only "ours" changed the chunk: the merge takes it from "ours". |
ChangedInTheirs | 2 | Only "theirs" changed the chunk: the merge takes it from "theirs". |
ChangedInBoth | 3 | Both sides made the same change: the merge takes it from "ours". |
Conflict | 4 | Both sides made different changes: the merge cannot choose. |