blob: 578ebe03ed38abffb431e7283b020e530a0c0886 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace LibGit2Sharp
{
/// <summary>
/// Enum specifying what content checkout should write to disk
/// for conflicts.
/// </summary>
public enum CheckoutFileConflictStrategy
{
/// <summary>
/// Use the default behavior for handling file conflicts. This is
/// controlled by the merge.conflictstyle config option, and is "Merge"
/// if no option is explicitly set.
/// </summary>
Normal,
/// <summary>
/// For conflicting files, checkout the "ours" (stage 2) version of
/// the file from the index.
/// </summary>
Ours,
/// <summary>
/// For conflicting files, checkout the "theirs" (stage 3) version of
/// the file from the index.
/// </summary>
Theirs,
/// <summary>
/// Write normal merge files for conflicts.
/// </summary>
Merge,
/// <summary>
/// Write diff3 formated files for conflicts.
/// </summary>
Diff3
}
}
|
