canton7/SyncTrayzor

Feature request: Configure (visual) diff tool for conflict resolution

Open

#296 opened on Jul 16, 2016

View on GitHub
 (6 comments) (4 reactions) (0 assignees)C# (5,477 stars) (390 forks)batch import
enhancementhelp wanted

Description

The conflict detection is a great feature, no doubt - but cleaning up the conflicts can still be a drag.

While I'm OK with "Show in folder", combined with having Araxis Merge in my "Send to..." context menu, it would be superb if SyncTrayzor could be configured with a diff tool (Araxis, P4Diff, WinMerge, ... the user provides the command line).
The user then updates the "key" file if desired (i.e. the one not tagged "conflict"). When the tool closes, ask the user if the "conflict" files can now be deleted, and the conflict considered resolved.

Contributor guide

Tech stack
csharp
Domain
desktoptooling
Issue type
feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-2 days
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
stale
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
mostly clear
Prerequisites
C#WinForms
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
55
Research direction
This feature request (issue #296) asks for a configurable external diff tool for conflict resolution. Implementation would involve adding a settings option to specify the diff tool command line, launching it on conflict files, and detecting when the tool closes to ask if conflicts are resolved. The main areas to explore are the settings UI (likely in a settings dialog) and the conflict resolution workflow (e.g., in the main window or file conflict handling code).