Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Nov 20, 2025

Resolved merge conflicts with main branch to keep the PR up to date.

Changes

  • Preserved canBeReferencedInPrompt and when properties in copilot_githubRepo tool configuration from feature branch
  • Integrated 62 files of changes from main including new copilot CLI sessions, TypeScript context improvements, and updated test outcomes

Conflict Resolution
The conflict in package.json occurred where main branch lacked the conditional enablement of the githubRepo tool. Resolved by keeping feature branch version:

{
  "name": "copilot_githubRepo",
  "canBeReferencedInPrompt": true,
  "when": "!config.github.copilot.chat.githubMcpServer.enabled",
  ...
}

This ensures #githubRepo is disabled when GitHub MCP Server is enabled, preventing redundancy.


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: TylerLeonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Copilot AI changed the title [WIP] Support GitHub MCP inbox Merge main into GitHub MCP inbox PR Nov 20, 2025
Copilot AI requested a review from TylerLeonhardt November 20, 2025 03:01
Copilot finished work on behalf of TylerLeonhardt November 20, 2025 03:01
Base automatically changed from tyler/poor-termite to main November 20, 2025 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants