Unsupported `merge.conflictstyle` option
Nobody has claimed this yet.
- Dominant language
- C++
- Stars
- 2.3k
- Forks
- 171
- Avg merge
- 3d 19h
- Merged PRs (30d)
- 10
Description
I'm getting the following error when trying to clone a github repository
Failed to clone into '/tmp/foo/bar.git' - unknown style 'zdiff3' given for 'merge.conflictstyle'
It's ok to me if those options aren't supported but I would expect that cloning would still work without that.
Resources: Here's a good blog post on what that option does https://neg4n.dev/blog/understanding-zealous-diff3-style-git-conflict-markers
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
Start by reproducing a clone with Git configured with merge.conflictstyle=zdiff3, then trace Gittyup's clone and configuration handling. Check how unsupported Git options are surfaced during cloning. Done means cloning proceeds successfully when this option is unsupported, with the existing error no longer aborting the operation.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- cpp, git
- Domain
- tooling
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 52/100