Every premium and members-only resource for $9.99/month, as a no-commitment subscription. See the plans

PalateKit

Sign in
Menu

Request a resource

Describe the resource you are missing in one sentence. We will email you when it is published.

0 / 280

A page, a video or an image online.

Unlock PalateKit

Unlock everything

Plan

Paying means accepting our terms of sale.

Secure payment by Stripe. Receipts and invoices sent by email.

Welcome back

Sign in to install, download or save this resource. A free account is enough for free resources.

Merging main into next: conflicts and CI v1.0.0

Use this resource to merge main into next, resolving conflicts, changesets and CI errors

New

  • 510 downloads
  • 172 likes
  • 201 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install main-to-next-merge-workflow

With no option, the skill goes to ~/.agents/skills/; add --agent claude-code (or codex, cursor…) to target an agent.

First time: connect the CLI with

npx --yes palatekit@latest login

The agent runs one stage of the merge based on the argument given: resolving Git conflicts, fixing build, type and test errors, or removing stale changesets. Each stage is described in its own file.

Mostly picked by

Updated November 2, 2026

Card for the “Merging main into next: conflicts and CI” skill

Details

Works in
Install guides
Generates with
Your agent's model
Licence
MIT

Similar resources

View all

What you get

  • SKILL.md: routing to the requested merge stage
  • resolve-conflicts.md, fix-ci.md, clean-changesets.md: one stage per file

Good fit for

  • You need to bring main into next in the Astro repository
  • CI fails after a merge and you want it fixed

Not for

    Tags

    • git
    • merge
    • conflicts
    • ci

    About

    You say

    “Merge main into next, resolve the conflicts, then fix the CI.”

    Card for the “Merging main into next: conflicts and CI” skill

    Skill published by withastro under the MIT license, delivered in its original version.

    Show more

    How to use it

    1. Install the skill in your agent's skills folder
    2. Ask your agent to merge main into next, resolving conflicts, changesets and CI errors
    3. Review and adjust the result

    Content preview

    Files

    • clean-changesets.md2.5 KB
    • evals/evals.json7 KB
    • fix-ci.md6.1 KB
    • LICENSE3.5 KB
    • NOTICE-PALATEKIT.md0.4 KB
    • resolve-conflicts.md3.2 KB
    • SKILL.md0.6 KB

    Origin and licence

    Listed unmodified

    Author
    withastro
    Source
    github.com/withastro/astro/tree/883e672fd0beb575b14776bc842bdee84433e6af/.agents/skills/merge
    Licence
    MIT

    Notice

    « merge » (withastro, MIT) livré dans sa version d'origine : fiche en français et en anglais par PalateKit.

    User reviews

    –

    No ratings yet

    Loading reviews…

    Delete your review?

    Your rating and comment will be removed from the page.