Git - fix wrong file count in conflict and discard dialogs

[xingsy97]

Fix two dialog message bugs in the git extension:

1. stageAllMerge warning shows wrong count and filename

categorizeResourceByResolution() splits merge resources into merge (all), unresolved (still have conflict markers), resolved, and deletionConflicts. The warning dialog used merge.length and merge[0] instead of unresolved.length and unresolved[0].

Before:

• 5 files in merge group (3 resolved, 2 unresolved)
• Dialog: "stage 5 files with merge conflicts?"
• Single-file case may show a resolved file's name

After:

• Dialog: "stage 2 files with merge conflicts?"
• Single-file case shows the actual unresolved file

The nearby stage command already uses unresolved correctly.

2. Trash fallback dialog shows wrong file count

When trash deletion fails, the fallback confirmation used resources.length (all selected resources) instead of toClean.length (only untracked/ignored files to permanently delete).

Before:

• User discards 3 untracked + 5 modified files, trash fails
• Dialog: "Delete All 8 Files?"
• Only 3 are actually deleted (the other 5 are restored via git checkout)

After:

• Dialog: "Delete All 3 Files?"

[vs-code-engineering]

📬 CODENOTIFY

The following users are being notified based on files changed in this PR:

@lszomoru

Matched files:

• extensions/git/src/commands.ts
• extensions/git/src/repository.ts

[Copilot]

Pull request overview

Fixes two user-facing dialog count/name issues in the built-in Git extension so warnings accurately reflect the set of files actually affected (unresolved merge conflicts and permanently-deleted resources).

Changes:

• Update git.stageAllMerge warning dialog to use the unresolved set (count + single-file basename) instead of the broader merge set.
• Update trash-deletion fallback dialog to display toClean.length (files that will be permanently deleted) instead of resources.length (all inputs).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
extensions/git/src/repository.ts	Fixes “Delete All {n} Files” to reflect the actual permanently-deleted file count (toClean).
extensions/git/src/commands.ts	Fixes merge-conflict staging warning to reference the unresolved conflict set for both plural/singular cases.