From 7f173daecb6716ee1288f9d96dd622c682f62d1b Mon Sep 17 00:00:00 2001 From: mika kuns Date: Fri, 5 Jun 2026 11:12:42 +0200 Subject: [PATCH] feat(ui): wire layer A/B conflict seams to the inline resolver --- src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs | 1 + src/ClaudeDo.Ui/Views/MainWindow.axaml.cs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs b/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs index c0887e9..976ee2f 100644 --- 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)) diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs index 4dcfcc7..2e68184 100644 --- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs +++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs @@ -81,6 +81,10 @@ public partial class MainWindow : Window var mergeDlg = new MergeModalView { DataContext = mergeVm }; await mergeDlg.ShowDialog(this); }; + modal.RequestConflictResolution = (taskId, target) => + DataContext is IslandsShellViewModel s + ? s.RequestConflictResolutionAsync(taskId, target) + : System.Threading.Tasks.Task.CompletedTask; await dlg.ShowDialog(this); }; vm.ShowRepoImportModal = async (modal) =>