Skip to content

Add Conflict Preview to community conflict tools #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LaptekTools wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Conflict Preview to community conflict tools #1030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions users/contrib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,13 @@ Resolving conflicts
finds each conflict and let the user decide whether to open the merge program
or to skip the file.

* `Conflict Preview <https://laptektools.github.io/conflict-preview/conflict-preview.html>`_

A read-only browser tool for selected Syncthing conflict copies. Groups
matching filenames and compares UTF-8 file contents, keeping unreadable
files and missing originals visible. It does not choose a version, merge
or delete files. `Source code <https://github.com/LaptekTools/conflict-preview>`_.

Older, Possibly Unmaintained
----------------------------

Expand Down