Support 3-way merge
Open
Nobody has claimed this yet.
- Dominant language
- Rust
- Stars
- 2.1k
- Forks
- 450
- Avg merge
- 11m
- Merged PRs (30d)
- 1
Description
Would it be possible to add support to Git's 3-way merge? When doing a merge I don't want it to fail but instead leave markers for user to resolve them.
Right now i'm using this:
Command::new("git").args(["apply", "--3way"]);
Contributor guide
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
The issue names no repository files or tests; begin by locating the Rust merge or apply entry points and comparing them with the shown Command::new("git").args(["apply", "--3way"]) invocation. Determine how 3-way conflicts should be exposed, including conflict markers for user resolution, and add coverage demonstrating the completed behavior.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, rust
- Domain
- tooling
- Issue type
- Feature
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Quiet
- Clarity
- Needs clarification
- Newbie friendliness
- 35/100