Skip to content

Commit ee8f665

Browse files
committed
Resolve merge conflict in ExtensionMessage.ts
- Merged editorContext type from feature branch - Merged showDeleteMessageDialog and showEditMessageDialog types from main - All three message types are now included in the union
2 parents c813fea + 38d8edf commit ee8f665

File tree

289 files changed

+10944
-6494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+10944
-6494
lines changed

.github/workflows/changeset-release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ jobs:
3131
ref: ${{ env.GIT_REF }}
3232
- name: Setup Node.js and pnpm
3333
uses: ./.github/actions/setup-node-pnpm
34-
with:
35-
skip-checkout: 'true'
3634

3735
# Check if there are any new changesets to process
3836
- name: Check for changesets

.github/workflows/marketplace-publish.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
ref: ${{ env.GIT_REF }}
2626
- name: Setup Node.js and pnpm
2727
uses: ./.github/actions/setup-node-pnpm
28-
with:
29-
skip-checkout: 'true'
3028
- name: Configure Git
3129
run: |
3230
git config user.name "github-actions[bot]"

.github/workflows/nightly-publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- name: Setup Node.js and pnpm
2121
uses: ./.github/actions/setup-node-pnpm
2222
with:
23-
skip-checkout: 'true'
2423
install-args: '--frozen-lockfile'
2524
- name: Forge numeric Nightly version
2625
id: version

.roo/rules-issue-fixer-orchestrator/10_pr_template_format.xml

Lines changed: 0 additions & 213 deletions
This file was deleted.

0 commit comments

Comments
 (0)