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.

Integrate a branch and resolve conflicts v1.0.0

Use this resource to integrate another branch and resolve merge conflicts without losing work

New

  • 410 downloads
  • 177 likes
  • 235 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install pull-and-merge-conflict-resolution

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 fetches and integrates the branch, reports each conflict explicitly, compares the versions using the repo's context and proposes choices ranked by impact. It edits no conflict marker before your answer and can abort the merge if you ask.

Mostly picked by

Updated November 2, 2026

Card for the “Integrate a branch and resolve conflicts” skill

Details

Works in
Install guides
Generates with
Your agent's model
Licence
Apache-2.0

Similar resources

View all

What you get

  • SKILL.md: integration steps, conflict report and analysis
  • reference.md: hard rules, anti-patterns and quick reference

Good fit for

  • Your branch must be updated from main and git reports conflicting files
  • You want to choose which version to keep before any change

Not for

    Tags

    • conflicts
    • merge
    • git
    • branch

    About

    You say

    “Update my branch from main and show me the conflicts before touching them.”

    Card for the “Integrate a branch and resolve conflicts” skill

    Skill published by cognitedata under the Apache-2.0 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 integrate another branch and resolve merge conflicts without losing work
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE11.3 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • reference.md0.7 KB
    • SKILL.md5.6 KB

    Origin and licence

    Listed unmodified

    Author
    cognitedata
    Source
    github.com/cognitedata/builder-skills/tree/2e39bd68c9dd7a461e659c39eacdfe97a03180d8/skills/pull-changes-resolve-conflicts
    Licence
    Apache-2.0

    Notice

    « pull-changes-resolve-conflicts » (cognitedata, Apache-2.0) 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.