ClaudeDo

Files

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

Helpers

fix: restore green test suite across all projects

2026-04-28 08:30:26 +02:00

Services

feat(online-inbox): gate access on Zitadel "user" project role

2026-06-10 13:46:17 +02:00

ViewModels

feat(merge): in-app 3-way merge editor (chunk 2b)

2026-06-18 16:46:43 +02:00

AppSettingsTests.cs

feat(i18n): add Language preference and Save() to AppSettings