Skip to content
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

Resolve conflicts file #1309

Open
ZephyrOff opened this issue Jul 11, 2024 · 0 comments
Open

Resolve conflicts file #1309

ZephyrOff opened this issue Jul 11, 2024 · 0 comments

Comments

@ZephyrOff
Copy link

Hi,
I'm trying to use pygit2 to resolve repo conflicts.
I intentionally created a conflict between a file in the local repo and a file in the remote repo. I have seen on certain methods that the favorite argument exists to have ours or theirs but I do not understand how to implement it, I always have "cannot create a tree from a not fully merged index" when I do my self .repo.index.write_tree()

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

No branches or pull requests

1 participant