Add "Open Merge Editor for Current File" command to Git extension

[Copilot]

Implements a new user-facing command in the Git extension that allows users to quickly open the merge editor for the currently active file when it contains merge conflicts.

Features

• New Command: Git: Open Merge Editor for Current File available in the Command Palette
• Smart Detection: Automatically detects merge conflicts by scanning for conflict markers (<<<<<<< and >>>>>>>)
• User-Friendly: Shows informative messages when no active editor or conflicts are found
• Contextual Availability: Only appears in Command Palette when a text editor is focused

Implementation Details

Command Behavior

1. Checks if there's an active text editor
2. Scans the current file for merge conflict markers using line-by-line parsing
3. If conflicts are found, opens the existing merge editor for the file
4. If no conflicts, shows message: "No merge conflicts found in the current file"
5. If no active editor, shows message: "No active text editor found"

Technical Changes

• CommandCenter.openMergeEditorForCurrentFile(): Main command implementation
• CommandCenter.hasConflictMarkers(): Robust conflict detection helper method
• package.json: Command contribution with editorTextFocus enablement condition
• package.nls.json: Localized command title

Conflict Detection

The implementation uses a robust line-by-line scanner that:

• Looks for lines starting with <<<<<<< (conflict start)
• Tracks when conflict end markers >>>>>>> are found
• Avoids false positives from conflict markers in comments or strings
• Reuses existing merge editor functionality

Usage

1. Open a file with merge conflicts
2. Open Command Palette (Ctrl+Shift+P / Cmd+Shift+P)
3. Search for "Open Merge Editor for Current File"
4. The merge editor will open automatically if conflicts are detected

This enhancement improves the developer workflow by providing quick access to merge conflict resolution without needing to navigate through the SCM view or right-click menus.

Warning

Firewall rules blocked me from connecting to one or more addresses

I tried to connect to the following addresses, but was blocked by firewall rules:

• electronjs.org
  • Triggering command: node-gyp (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

• Configure Actions setup steps to set up my environment, which run before the firewall is enabled
• Add the appropriate URLs or hosts to my firewall allow list

---

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