Skip to content

Commit 9ad206a

Browse files
AArnottCopilot
andcommitted
Switch AI-assisted merging from a prompt to a skill
This makes it available in Copilot CLI. Co-authored-by: Copilot <copilot@github.com>
1 parent 0a9483f commit 9ad206a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/prompts/update-library-template.prompt.md renamed to .github/skills/update-library-template/SKILL.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
---
2+
name: update-library-template
23
description: Merges the latest Library.Template into this repo (at position of HEAD) and resolves conflicts.
4+
disable-model-invocation: true
35
---
46

57
# Instructions
68

7-
1. Run `tools/MergeFrom-Template.ps1`
9+
1. Run `./tools/MergeFrom-Template.ps1` from the repo root.
810
2. Resolve merge conflicts, taking into account conflict resolution policy below.
911
3. Validate the changes, as described in the validation section below.
1012
4. Committing your changes (if applicable).
1113

1214
## Conflict resolution policy
1315

14-
There may be special notes in `.github/prompts/template-release-notes.md` that describe special considerations for certain files or scenarios to help you resolve conflicts appropriately.
16+
There may be [special notes](template-release-notes.md) that describe special considerations for certain files or scenarios to help you resolve conflicts appropriately.
1517
Always refer to that file before proceeding.
1618
In particular, focus on the *incoming* part of the file, since it represents the changes from the Library.Template that you are merging into your repo.
1719

.github/prompts/template-release-notes.md renamed to .github/skills/update-library-template/template-release-notes.md

File renamed without changes.

0 commit comments

Comments
 (0)