Skip to content

docs(users): add ConflictBench to conflict tools - #1032

Open
rad1092 wants to merge 1 commit into
syncthing:mainfrom
rad1092:docs/add-conflictbench
Open

rad1092 wants to merge 1 commit into
syncthing:mainfrom
rad1092:docs/add-conflictbench

Conversation

@rad1092

@rad1092 rad1092 commented Oct 12, 2026

Copy link
Copy Markdown

Adds ConflictBench under Resolving conflicts for local review, explicit version choices, and backups outside synced folders; users must pause the affected Syncthing folder before applying changes.

Submitted for the project owner, rad1092, with Codex assistance.

Copilot AI balanced review requested due to automatic review settings October 12, 2026 11:16

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants