Port Commit Copilot Skill
Cherry-pick commits from DsMainDev into SQL Server release branches - PR, Hotfix Bug, and all the busywork, handled by @portcommit in Copilot Chat.
Commands
All commands are used in the Copilot Chat panel, prefixed with @portcommit.
Start a workflow
| Command |
Description |
/port <target> <hash> |
Full flow: cherry-pick -> PR -> Hotfix Bug |
/pr <target> <hash> |
Cherry-pick -> PR only (no bug) |
/bug <target> <hash> [PR-ID] |
Create a Hotfix Bug only (no git operations) |
Targets: sql25, sql22, or any remote branch name.
- Known targets (
sql25, sql22) create a PR and a Hotfix Bug with the correct area path, CU iteration, and deployment tag.
- Custom branch names (e.g.
rel/some/feature-branch) create a PR and link original work items - no bug, no template, no labels.
Examples:
@portcommit /port sql25 abc1234def
@portcommit /port sql22 9f8e7d6c
@portcommit /port rel/box/sql2025/some-branch abc1234def
@portcommit /pr sql25 abc1234def
@portcommit /bug sql25 abc1234def 2012345
Resume a workflow
If the cherry-pick produces merge conflicts, the workflow pauses and shows you the conflicted files.
| Command |
Description |
/continue |
Resume after you've manually resolved conflicts |
/resolve port |
Auto-resolve all conflicts - keep the ported commit version |
@portcommit /continue
@portcommit /resolve port
What does /port actually do?
- Fetches the commit from origin (if not available locally)
- Switches to the release branch and creates a port branch
- Cherry-picks the commit
- Auto-excludes files that should never be ported (mgmt/, TestJobs.xml, test dirs)
- Detects merge conflicts - pauses for you to resolve, or use
/resolve
- Commits and pushes the port branch
- Creates a draft PR with an AI-populated Box Servicing description
- Adds labels and required reviewers (Train Conductors)
- Creates a linked Hotfix Bug with area path, CU iteration, deployment tag
- Links original work items from the source PR
If anything goes wrong, the working tree is cleaned up automatically - port branch deleted, switched back to the release branch.
Roadmap
- Bulk port - queue multiple commits, automatically ordered by dependency
- AI conflict suggestions - the agent analyzes both sides and suggests a resolution
- Target any release branch - not only sql22/25
