accept theirs and accept yours very flaky especially with deleted files
Open
Nobody has claimed this yet.
- Dominant language
- C++
- Stars
- 2.3k
- Forks
- 171
- Avg merge
- 3d 19h
- Merged PRs (30d)
- 10
Description
Most of the time when i use accept theirs and accept yours it does not work properly. The conflict is not resolved sometimes, sometimes it works but it is still shown as conflict.
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
No file, test, or entry point is named. Start by reproducing the issue with “accept theirs” and “accept yours,” including conflicts involving deleted files, and observe when the conflict remains unresolved or is still displayed. Done means both actions reliably resolve the conflict and the interface no longer shows it as unresolved.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- cpp, git
- Domain
- desktop, tooling
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 35/100