Add a FileConflictStrategy property to CheckoutOptions

CherryPickOptions, MergeOptions, RevertOptions already expose such property.

Let’s also make this option available when performing a simple checkout

Related: https://stackoverflow.com/questions/26878695/what-is-the-libgit2sharp-equivalent-of-git-checkout-ours

[sushihangover]

Seeing that the attached PR is not merged and going back to the original question on StackoverFlow which boils down to how you would do a:

• git checkout --ours

• git checkout --theirs

  –ours, --theirs When checking out paths from the index, check out stage #2 (ours) or #3 (theirs) for unmerged paths.

Since this only applies when you have current unmerged paths (conflicts) while the repo has an active merge state, would it make sense to add a checkout extension to Conflicts.[Ours|Theirs], i.e:

repo.Index.Conflicts[0].Ours.Checkout();
repo.Index.Conflicts[1].Theirs.Checkout();

or a new variant of CheckoutPaths that accepts a Conflict Ours/Theirs IndexEntry:

foreach (var conflict in repo.Index.Conflicts) {
   repo.CheckoutPaths(conflict.Theirs)
}

[jaccarmac]

All right, thanks for the direction. I guess there’s not a place for a new issue here until the merge-support is in the C library. I’ll still review the existing code and apologies for the sidetrack.