4 Commits

Include renames

Author	SHA1	Message	Date
Mika Kuns	23a93ce0bb	fix(merge): unresolved conflicts compose to empty, not Ours (+ review nits) ... Code-review follow-ups before push: - MergeFile.ResultText/Compose() fell back to Ours for unresolved conflicts while the editor seeds them empty — align both on empty so the public model matches the pane and Continue can't silently auto-accept Ours. - Bound the gutter re-layout retry (was an unbounded Background re-post when the editor isn't laid out, e.g. minimized). - Pluralize the readout ('1 conflict' not '1 conflicts'). Tests updated. Ui 128 green.	2026-06-19 13:14:51 +02:00
Mika Kuns	378a92c156	feat(merge): unify planning conflicts onto the resolver + 3-pane VM foundation ... Route planning unit-merge conflicts through ConflictResolverViewModel (OpenForPlanningAsync) and delete the old ConflictResolutionViewModel dialog. Add active-file 3-pane reconstruction (MergeFile OursText/TheirsText/ResultText, ActiveFile, SelectFileCommand, active-file readout) as the VM foundation for the Rider-style editor. Seam preserved; Ui.Tests 128/128.	2026-06-19 09:58:32 +02:00
Mika Kuns	92767c646e	feat(merge): in-app 3-way merge editor (chunk 2b) ... Replace the whole-file conflict resolver with a real 3-way merge editor built on the line-level hunk pipeline. - ConflictModels: MergeFile/MergeFileSegment/MergeConflictBlock with Compose() that reassembles stable text + chosen resolutions - ConflictResolverViewModel (same seam contract): loads conflict documents, flattens conflicts for one-at-a-time navigation, per-block Accept Ours/Base/Theirs/Both + editable result, binary files block continue - ConflictResolverView: 3-column Base|Ours|Theirs + editable result via AvaloniaEdit with TextMate syntax highlighting by file extension; editors synced in code-behind - add Avalonia.AvaloniaEdit + AvaloniaEdit.TextMate + TextMateSharp.Grammars; AvaloniaEdit theme StyleInclude in App.axaml - rewrite ConflictResolverViewModel tests (load/gating/compose/nav/binary/abort)	2026-06-18 16:46:43 +02:00
mika kuns	0b623b8e4a	feat(ui): add inline conflict model (file/hunk with resolution)	2026-06-05 10:55:20 +02:00