LibGit2Sharp 1冲突阻止结帐(LibGit2Sharp 1 conflict prevent from checkout)

 我目前有这个问题，我的应用程序使用libgit2sharp总是崩溃witht消息： 
 
 
 
 1冲突阻止结帐 
 
 
 当试图调用repo.Pull 
 
 奇怪的是，如果我打印本地存储库的状态，它们在存储库中没有任何更改。 
 
 我甚至尝试重置存储库，或者检查文件，但没有任何帮助。 这是我的代码： 
 
using (LibGit2Sharp.Repository repo = new LibGit2Sharp.Repository(path))
{
    var tipId = repo.Head.Tip.Tree;
    Log.LogManagerInstance.Instance.Info("HEAD tree id: " + tipId.Id.ToString());

    // Pull changes
    PullOptions options = new PullOptions();

    options.FetchOptions = new FetchOptions();
    options.MergeOptions = new MergeOptions();

    // ! Only for trying to fix the bug. Should not be here
    options.MergeOptions.FileConflictStrategy = CheckoutFileConflictStrategy.Theirs;

    repo.Reset(repo.Head.Tip);
    // ! --

    options.FetchOptions.CredentialsProvider = CredentialsHandler;

    Log.LogManagerInstance.Instance.Info("Try pull from remote repository");

    // Pull changes from network
    var result = repo.Network.Pull(new LibGit2Sharp.Signature(username, mail, new DateTimeOffset(DateTime.Now)), options);

    if (result != null && result.Commit != null)
    {
        Log.LogManagerInstance.Instance.Info("Pulled from remote branch, new tree id: " + result.Commit.Tree.Id.ToString());

        // get difference in the git tree (file-system)
        var diffs = repo.Diff.Compare<TreeChanges>(tipId, result.Commit.Tree);

        MergeTreeChangesToDatabase(diffs, path);
    }
    else
    {
        Log.LogManagerInstance.Instance.Info("Local repository is up-to-date with the remote branch");
    }
}
 
 非常感谢你。 
 
 编辑 
 
 
 
 使用预发布0.22似乎解决了我的问题。 
 

I currently have the problem, that my application using libgit2sharp always crashs witht the message:
 
 
 
1 conflict prevents from checkout
 
 
when trying to call repo.Pull
 
The curious thing is, if i print the status of the local repository, their are no changes in the repository.
 
I even tried resetting the repository at first, or checking the files out, but nothing helps. This is my code:
 
using (LibGit2Sharp.Repository repo = new LibGit2Sharp.Repository(path))
{
    var tipId = repo.Head.Tip.Tree;
    Log.LogManagerInstance.Instance.Info("HEAD tree id: " + tipId.Id.ToString());

    // Pull changes
    PullOptions options = new PullOptions();

    options.FetchOptions = new FetchOptions();
    options.MergeOptions = new MergeOptions();

    // ! Only for trying to fix the bug. Should not be here
    options.MergeOptions.FileConflictStrategy = CheckoutFileConflictStrategy.Theirs;

    repo.Reset(repo.Head.Tip);
    // ! --

    options.FetchOptions.CredentialsProvider = CredentialsHandler;

    Log.LogManagerInstance.Instance.Info("Try pull from remote repository");

    // Pull changes from network
    var result = repo.Network.Pull(new LibGit2Sharp.Signature(username, mail, new DateTimeOffset(DateTime.Now)), options);

    if (result != null && result.Commit != null)
    {
        Log.LogManagerInstance.Instance.Info("Pulled from remote branch, new tree id: " + result.Commit.Tree.Id.ToString());

        // get difference in the git tree (file-system)
        var diffs = repo.Diff.Compare<TreeChanges>(tipId, result.Commit.Tree);

        MergeTreeChangesToDatabase(diffs, path);
    }
    else
    {
        Log.LogManagerInstance.Instance.Info("Local repository is up-to-date with the remote branch");
    }
}
 
Thank you very much.
 
EDIT
 
 
 
Using the pre release 0.22 seems to solve my problem.
 

原文：https://stackoverflow.com/questions/33545850