Resolve conflicts file

Open
#1,309 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Assessment

Difficulty
4/5
Estimated time
3-5 days
Newbie friendliness
25/100
Issue type
Bug
Clarity
Needs clarification
Activity status
Stale
Tech stack
git, python
Domain
tooling

Research direction

Start with pygit2's conflict-resolution API and the repo.index.write_tree() call described in the report. Reproduce the intentionally conflicting local and remote files, then determine how the favorite argument should be applied before writing the tree. Done means documenting or correcting the supported ours/theirs workflow so the index can be written without the reported error.

Written by the indexing model from the issue text.

Description

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()

Dominant language
Python
Stars
1.7k
Forks
408
Avg merge
2d 57m
Merged PRs (30d)
7

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.

More from libgit2/pygit2

All issues in libgit2/pygit2

Similar issues

More Python issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.