Merge branch 'claudedo/75514ee68371402b814638290af47cca'

2026-08-06 12:11:38 +02:00
parent 0358bcf8b2 5d1d2d89d0
commit 20bce9b424
15 changed files with 379 additions and 14 deletions
@@ -281,5 +281,27 @@
      </StackPanel>
    </Border>

+    <!-- External merge popup card — bottom-left corner, while an MCP session owns an
+         unresolved unit-merge conflict. Does not auto-dismiss; stays until the merge ends. -->
+    <Border Grid.Row="0" Grid.RowSpan="3"
+            VerticalAlignment="Bottom" HorizontalAlignment="Left"
+            Margin="16,0,0,30"
+            ZIndex="100"
+            IsVisible="{Binding IsExternalMergeBannerVisible}"
+            Background="{DynamicResource DeepBrush}"
+            BorderBrush="{DynamicResource PeatBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            Padding="14,10">
+      <StackPanel Spacing="8" Width="300">
+        <TextBlock Classes="body" Text="{loc:Tr shell.externalMerge.banner}" TextWrapping="Wrap"/>
+        <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right">
+          <Button Classes="btn"
+                  Content="{loc:Tr shell.externalMerge.open}"
+                  Command="{Binding OpenExternalMergeConflictCommand}"/>
+        </StackPanel>
+      </StackPanel>
+    </Border>
+
  </Grid>
 </Window>