libgit2 / libgit2/libgit2sharp

Add a FileConflictStrategy property to CheckoutOptions

Open
#868 13 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Easy fix Up for grabs
Dominant language
C#
Stars
3.5k
Forks
925
PR merge metrics
No merged PRs in 30d

Description

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

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start by locating CheckoutOptions and compare its API with the FileConflictStrategy properties on CherryPickOptions, MergeOptions, and RevertOptions. Trace the simple checkout entry point to understand how options are consumed; done means checkout accepts and exposes the requested conflict strategy consistently.

Written by the indexing model from the issue text.

Assessment

Tech stack
csharp, git
Domain
tooling
Issue type
Feature
Difficulty
2/5
Estimated time
1-3 hours
Activity status
Stale
Clarity
Clearly specified
Newbie friendliness
55/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.