The handleUncommittedChanges function was showing a warning dialog for all uncommitted changes, including untracked files. However, untracked files typically don't conflict with PR checkout unless the PR branch creates a file at the same path.

This caused unnecessary friction for users who commonly have untracked files in their workspace (like environment configs, temporary files, etc.) when switching between PRs.

Changes Made

• Filter untracked files: Modified handleUncommittedChanges to filter out files with Status.UNTRACKED status before checking for conflicts
• Updated logic: Only show the warning dialog when there are tracked changes that could actually cause conflicts
• Safe operations: Updated stash/discard operations to only handle tracked files, leaving untracked files untouched
• Never show again option: Added a "Don't show again" button that uses extension local state to permanently disable the warning dialog

Before vs After

Before: Warning appears for any uncommitted changes including untracked files

After:

• Warning only appears for tracked changes that could cause conflicts
• Users can permanently disable the warning with "Don't show again" option stored in extension local state
• Dialog now shows three options: "Stash changes", "Discard changes", and "Don't show again"

Implementation Details

The "never show again" functionality uses the extension's PersistentState infrastructure:

• PersistentState.fetch() checks if user has disabled warnings
• PersistentState.store() saves the preference when user clicks "Don't show again"
• Preference persists across VS Code sessions without exposing a user-configurable setting

Test Cases

This is a minimal change that maintains existing behavior for legitimate conflicts while eliminating spurious warnings for untracked files and giving users control over the dialog experience.

Fixes #7294.

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.