ClaudeDo/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml

<Window xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:vm="using:ClaudeDo.Ui.ViewModels.Planning"
        xmlns:ctl="using:ClaudeDo.Ui.Views.Controls"
        xmlns:loc="using:ClaudeDo.Ui.Localization"
        x:DataType="vm:ConflictResolutionViewModel"
        x:Class="ClaudeDo.Ui.Views.Planning.ConflictResolutionView"
        Title="{loc:Tr planning.conflict.windowTitle}"
        Width="560" SizeToContent="Height" MinWidth="460"
        CanResize="True"
        WindowDecorations="BorderOnly"
        ExtendClientAreaToDecorationsHint="True"
        ExtendClientAreaTitleBarHeightHint="-1"
        WindowStartupLocation="CenterOwner"
        Background="{DynamicResource SurfaceBrush}">

  <Window.KeyBindings>
    <KeyBinding Gesture="Escape" Command="{Binding AbortCommand}"/>
  </Window.KeyBindings>

  <ctl:ModalShell Title="{loc:Tr planning.conflict.modalTitle}" CloseCommand="{Binding AbortCommand}">
    <ctl:ModalShell.Footer>
      <StackPanel Orientation="Horizontal" Spacing="8"
                  HorizontalAlignment="Right" VerticalAlignment="Center">
        <Button Classes="btn" Content="{loc:Tr planning.conflict.openInVsCode}" Command="{Binding OpenInVsCodeCommand}"/>
        <Button Classes="btn" Content="{loc:Tr planning.conflict.resolved}" Command="{Binding ContinueCommand}"/>
        <Button Classes="btn" Content="{loc:Tr planning.conflict.abort}" Command="{Binding AbortCommand}"/>
      </StackPanel>
    </ctl:ModalShell.Footer>

    <!-- Content -->
    <StackPanel Spacing="12" Margin="20,16" MinWidth="520">
      <TextBlock Classes="heading"
                 Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/>
      <TextBlock Classes="body" Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}"/>
      <ItemsControl ItemsSource="{Binding ConflictedFiles}">
        <ItemsControl.ItemTemplate>
          <DataTemplate>
            <TextBlock Classes="path-mono" Text="{Binding}"/>
          </DataTemplate>
        </ItemsControl.ItemTemplate>
      </ItemsControl>
      <TextBlock Classes="meta" Text="{Binding VsCodeError}" Foreground="{DynamicResource BloodBrush}"
                 IsVisible="{Binding VsCodeError, Converter={x:Static ObjectConverters.IsNotNull}}"
                 TextWrapping="Wrap"/>
      <TextBlock Classes="meta" Text="{Binding ActionError}" Foreground="{DynamicResource BloodBrush}"
                 IsVisible="{Binding ActionError, Converter={x:Static ObjectConverters.IsNotNull}}"
                 TextWrapping="Wrap"/>
    </StackPanel>

  </ctl:ModalShell>
</Window>