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.

Sync a branch with origin/main and resolve conflicts v1.0.0

Use this resource to sync the current branch with origin/main by merging and resolve conflicts

New

  • 435 downloads
  • 248 likes
  • 241 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install sync-branch-with-main

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 checks the repo state, enables rerere, fetches the latest refs and merges origin/main into the current branch rather than rebasing. It guides conflict resolution and asks you only when a decision is really needed.

Mostly picked by

Updated November 2, 2026

Card for the “Sync a branch with origin/main 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: merge steps from repo check to remote sync
  • SKILL.md: best practices for resolving conflicts

Good fit for

  • Your feature branch is behind main
  • A remote commit changed the branch while you were working

Not for

    Tags

    • git
    • merge
    • conflicts

    About

    You say

    “Update my branch with origin/main and help me resolve the conflicts.”

    Card for the “Sync a branch with origin/main and resolve conflicts” skill

    Skill published by odysseus0 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 sync the current branch with origin/main by merging and resolve conflicts
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE11.3 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • SKILL.md4.7 KB

    Origin and licence

    Listed unmodified

    Author
    odysseus0
    Source
    github.com/odysseus0/symphony/tree/04902e34e9eb6d6cfbddd543a447c1ebbfebadc1/.agents/skills/pull
    Licence
    Apache-2.0

    Notice

    « pull » (odysseus0, 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.