feat(ui): wire layer A/B conflict seams to the inline resolver

2026-06-05 11:12:42 +02:00
parent e71c0ed24f
commit 7f173daecb
2 changed files with 5 additions and 0 deletions
--- a/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs
+++ b/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs
@@ -227,6 +227,7 @@ public sealed partial class IslandsShellViewModel : ViewModelBase
            _ = Lists.RefreshCountsAsync();
            return System.Threading.Tasks.Task.CompletedTask;
        };
+        Details.RequestConflictResolution = RequestConflictResolutionAsync;
        Worker.PropertyChanged += (_, e) =>
        {
            if (e.PropertyName is nameof(WorkerClient.IsConnected) or nameof(WorkerClient.IsReconnecting))