Mika Kuns b3e099ca01 refactor(merge): drop dead hunks conflict API ...

GetConflictsAsync/GetMergeConflicts (+ MergeConflicts/ConflictFileContent/ConflictFileDto/ConflictHunkDto DTOs and the now-orphaned GitService.ShowStageAsync) were superseded by the segment-based GetMergeConflictDocuments path and had no production callers. Removes the IWorkerClient member, both test fakes, the lingering test, and updates the Worker/Ui/Data CLAUDE.md surface notes.

2026-06-26 16:11:47 +02:00

..

Assets/Fonts

feat(ui): embed Inter Tight and JetBrains Mono fonts

2026-04-20 10:11:06 +02:00

Converters

refactor(ui): render worktree modal diff via canonical DiffLinesView

2026-06-05 11:00:19 +02:00

Design

feat(merge): diff Merge opens the 3-pane editor + conflict overview ruler

2026-06-19 11:31:34 +02:00

Helpers

feat(ui): render user tool_result blocks as one-line summaries

2026-04-21 15:13:00 +02:00

Localization

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

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

Services

refactor(merge): drop dead hunks conflict API

2026-06-26 16:11:47 +02:00

ViewModels

fix(merge): unresolved conflicts compose to empty, not Ours (+ review nits)

2026-06-19 13:14:51 +02:00

Views

fix(merge): unresolved conflicts compose to empty, not Ours (+ review nits)

2026-06-19 13:14:51 +02:00

AppSettings.cs

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

2026-06-03 11:45:06 +02:00

AssemblyInfo.cs

refactor(ui): test planning detail pane via real ViewModel and restore merge-all IsEnabled binding

2026-04-24 16:31:54 +02:00

CLAUDE.md

refactor(merge): drop dead hunks conflict API

2026-06-26 16:11:47 +02:00

ClaudeDo.Ui.csproj

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

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