ClaudeDo

releases/ClaudeDo

Fork 0

Commit Graph

Author	SHA1	Message	Date
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	d2a08d2cda	chore(claude-do): refactor(hub): Konflikt-Merge-Methoden eindeutig benennen (C Kontext: Auf der Hub/Client-Ebene existieren zwei fast gleichnamige Methodenpaare mit unterschiedlicher Semantik: ContinueMerge/AbortMerge (Single-Task-Konflikt-Resolver, Layer C) vs. ContinuePlanningMerge/AbortPlanningMerge (Unit-Merge eines Parents mit Kindern). Verwechslungsgefahr. Änderungen (NUR die Hub/Client/UI-Ebene umbenennen): 1. src/ClaudeDo.Worker/Hub/WorkerHub.cs: ContinueMerge → Con ClaudeDo-Task: 5f2e0f88-d4c9-490b-95a7-46244465dbb6	2026-06-09 23:36:18 +02:00
mika kuns	d8a973d0e1	feat(ui): add inline conflict resolver view-model	2026-06-05 10:56:47 +02:00

Author

SHA1

Message

Date

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

d2a08d2cda

chore(claude-do): refactor(hub): Konflikt-Merge-Methoden eindeutig benennen (C

Kontext: Auf der Hub/Client-Ebene existieren zwei fast gleichnamige Methodenpaare mit unterschiedlicher Semantik: ContinueMerge/AbortMerge (Single-Task-Konflikt-Resolver, Layer C) vs. ContinuePlanningMerge/AbortPlanningMerge (Unit-Merge eines Parents mit Kindern). Verwechslungsgefahr.

Änderungen (NUR die Hub/Client/UI-Ebene umbenennen):
1. src/ClaudeDo.Worker/Hub/WorkerHub.cs: ContinueMerge → Con

ClaudeDo-Task: 5f2e0f88-d4c9-490b-95a7-46244465dbb6

2026-06-09 23:36:18 +02:00

mika kuns

d8a973d0e1

feat(ui): add inline conflict resolver view-model

2026-06-05 10:56:47 +02:00

3 Commits