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

..

ConflictResolutionViewModelTests.cs

feat(ui): richer diff viewer + surface child roadblocks on parents

2026-06-09 16:40:59 +02:00

ConflictResolverViewModelTests.cs

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

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

DetailsIslandConflictSeamTests.cs

chore(claude-do): refactor(ui): DetailsIslandViewModel (1431 Zeilen) in Sektio

2026-06-10 00:31:09 +02:00

DetailsIslandPlanningTests.cs

chore(claude-do): refactor(ui): DetailsIslandViewModel (1431 Zeilen) in Sektio

2026-06-10 00:31:09 +02:00

DetailsIslandPrepModeTests.cs

chore(claude-do): refactor(ui): DetailsIslandViewModel (1431 Zeilen) in Sektio

2026-06-10 00:31:09 +02:00

DetailsIslandReviewActionsTests.cs

feat(review): unify review actions into the Git-tab cockpit

2026-06-18 15:52:41 +02:00

DetailsIslandTabsTests.cs

feat(ui): add IsGitTab flag to work console view model

2026-06-05 08:28:12 +02:00

DiffModalViewModelTests.cs

chore(claude-do): fix(ui): DiffModal — Commit-Range ohne HeadCommit zeigt stil

2026-06-09 23:14:37 +02:00

MergePreviewPresenterTests.cs

feat(ui): show mergeability and surface approve conflicts in the work console

2026-06-04 23:35:53 +02:00

NotesEditorViewModelTests.cs

feat(ui): My Day actions, orphan-aware grouping, menu restructure

2026-06-18 16:22:29 +02:00

PlanningDiffViewModelTests.cs

feat(i18n): localize ViewModel-built strings via ambient Loc accessor

2026-06-03 12:43:30 +02:00

PrimeClaudeTabViewModelTests.cs

feat(ui): drive prime schedule rows from weekday toggles

2026-06-02 16:40:41 +02:00

TasksIslandDailyPrepTests.cs

feat(daily-prep): trigger planning from inside the prep-log window with an empty-state hint

2026-06-04 10:01:27 +02:00

TasksIslandRegroupTests.cs

refactor(data): retire legacy TaskStatus values and backfill existing rows

2026-04-27 15:28:55 +02:00

TasksIslandRemoveFromQueueTests.cs

feat(ui): cascade dequeue to queued children for any parent

2026-04-30 14:17:37 +02:00

UnifiedDiffParserTests.cs

feat(ui): richer diff viewer + surface child roadblocks on parents

2026-06-09 16:40:59 +02:00

WeeklyReportRangeTests.cs

feat(ui): WeeklyReportModalViewModel with default-range logic

2026-06-03 09:54:10 +02:00

WorktreesOverviewBatchMergeTests.cs

feat(ui): wire batch selection, target loading and resolve seam

2026-06-05 10:50:38 +02:00