releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 12 Wiki Activity

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

Browse Source
This commit is contained in:
mika kuns
2026-06-05 11:12:42 +02:00
parent e71c0ed24f
commit 7f173daecb
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs
View File

@@ -227,6 +227,7 @@ public sealed partial class IslandsShellViewModel : ViewModelBase
_ = Lists.RefreshCountsAsync(); _ = Lists.RefreshCountsAsync();
return System.Threading.Tasks.Task.CompletedTask; return System.Threading.Tasks.Task.CompletedTask;
}; };
Details.RequestConflictResolution = RequestConflictResolutionAsync;
Worker.PropertyChanged += (_, e) => Worker.PropertyChanged += (_, e) =>
{ {
if (e.PropertyName is nameof(WorkerClient.IsConnected) or nameof(WorkerClient.IsReconnecting)) if (e.PropertyName is nameof(WorkerClient.IsConnected) or nameof(WorkerClient.IsReconnecting))

4
src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
View File

@@ -81,6 +81,10 @@ public partial class MainWindow : Window
var mergeDlg = new MergeModalView { DataContext = mergeVm }; var mergeDlg = new MergeModalView { DataContext = mergeVm };
await mergeDlg.ShowDialog(this); 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); await dlg.ShowDialog(this);
}; };
vm.ShowRepoImportModal = async (modal) => vm.ShowRepoImportModal = async (modal) =>