Skip to content

Remove conflicts in Index.Remove #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2014
Merged

Conversation

ethomson
Copy link
Member

We never got around to dealing with conflicts properly in #398. We should do that.

@nulltoken nulltoken merged commit 4bc4857 into libgit2:vNext Jun 19, 2014
@nulltoken
Copy link
Member

👍

@nulltoken nulltoken added this to the v0.19.0 milestone Aug 24, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants