using System; using System.Collections.Generic; using System.Linq; using System.Text; namespace LibGit2Sharp { /// /// Enum specifying what content checkout should write to disk /// for conflicts. /// public enum CheckoutFileConflictStrategy { /// /// 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. /// Normal, /// /// For conflicting files, checkout the "ours" (stage 2) version of /// the file from the index. /// Ours, /// /// For conflicting files, checkout the "theirs" (stage 3) version of /// the file from the index. /// Theirs, /// /// Write normal merge files for conflicts. /// Merge, /// /// Write diff3 formated files for conflicts. /// Diff3 } }