syncthing / syncthing/syncthing
External conflict handling tool (to merge, or select winner)
Nobody has claimed this yet.
- Dominant language
- Go
- Stars
- 88.8k
- Forks
- 5.5k
- Avg merge
- 2d 10h
- Merged PRs (30d)
- 5
Description
hi,
Now that syncthing has a conflict handling system, it thought would be nice to propose some kind of semi-automatic conflict resolution. (especially on first time merge, despite i saw the temporary master trick was a nice idea on some other thread)
I was thinking if something like git merge tool would be possible? That is, syncthing knows the conflict file list, and open something like vimdiff, meld, etc, to ask the user to resolve conflicts one after the other ?
Thank you
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
Start by reviewing Syncthing's existing conflict handling system and how it exposes the conflict file list. Compare the proposed git merge tool workflow with external tools such as vimdiff or meld, then clarify the supported interaction and what successful first-time conflict resolution should look like.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, go
- Domain
- tooling
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100