How do you clear a conflict state on a single file

[yishaigalatzer]

I have a state where conflicts are created by the msysgit pull command.

It's fairly easy (though not well documented) to get the state of the file by iterating the index entries and comparing paths (thanks @ethomson!).

foreach (var entry in _repository.Index)
{
if (entry.StageLevel != StageLevel.Staged)
{
yield return entry.Path;
}
}

I also noticed (correctly or not) that if I unstage the conflicted file, I can now proceed to commit the changes in the file on disk.

However I couldn't find a way to do a similar when the user decides to delete the conflict file. (Well except for ugly hacks I'm embarrassed to mention here).

Any suggestions?

[ethomson]

Doh. We added a new method in libgit2 that will move conflicts to the REUC when deleting a file from the index. My intent was to update libgit2sharp once we updated the binary dependency. I think they've been updated and I missed my opportunity. Let me take a look at this.

My intent is that Remove should clear the conflict just like Add does.

[yishaigalatzer]

Thanks Ed. I'll wait for your PR to come through.

I also opened a separate issue to track conflict resolution for a single file without actually staging/add/removing it. Its necessary for a fundamental conflict resolution flow. More details in issue #328

[yishaigalatzer]

Any news?