- Guard Windows-only ServiceController/registry calls behind SupportedOSPlatform and OperatingSystem.IsWindows() (CA1416) - Initialize test-only ctor fields with null! (CS8618) - Migrate obsolete Avalonia APIs: Watermark -> PlaceholderText, SystemDecorations -> WindowDecorations Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Opens a modal when PlanningMergeConflict fires, listing conflicted files with options to open in VS Code, continue, or abort the merge. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>