New: 97,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Rebase Commit Push PR

by farm-fe in farm-fe/farm

Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.

MITAuto-check passedDevelopment

Install Rebase Commit Push PR

skills CLI
$ npx skills add farm-fe/farm --skill rebase-commit-push-pr -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install farm-fe/farm rebase-commit-push-pr --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/farm-fe/farm.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/rebase-commit-push-pr .claude/skills/rebase-commit-push-pr && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
rebase-commit-push-pr
GitHub stars
5.6k
Token cost
~551 tokens
SKILL.md length
260 words
Files
1
Skills in repo
20
Repo updated
First seen
Licence
MIT

At a glance

Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.

  • Works in 7 steps: Inspect branch and working tree → Fetch and rebase onto main → Resolve rebase conflicts (if any) → …
  • Tasks that involve Git workflow
  • SKILL.md covers Steps and Guardrails
  • Calls git and gh

What it does

Rebase Commit Push PR is an agent skill from farm-fe/farm. Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.

Its SKILL.md is about 550 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts. Compatibility notes: Requires git repository with origin remote and GitHub CLI (gh) for PR checks/creation.

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Extremely fast Vite-compatible web build tool written in Rust. The licence is MIT.

When your agent uses it

  • Tasks that involve Git workflow

Example prompts

  • “/rebase-commit-push-pr”

Requirements

  • Compatibility (from SKILL.md): Requires git repository with origin remote and GitHub CLI (gh) for PR checks/creation.

Workflow steps

7 steps, taken from the first numbered list in SKILL.md.

  1. Inspect branch and working tree
  2. Fetch and rebase onto main
  3. Resolve rebase conflicts (if any)
  4. Commit user-requested local changes (only if needed)
  5. Push branch
  6. Ensure a PR exists
  7. Report result

What it can do on your machine

Read from SKILL.md and the folder at commit 2000ef8. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • gh

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git and gh, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

  • Compatibility

    Requires git repository with origin remote and GitHub CLI (gh) for PR checks/creation.

    From compatibility in the SKILL.md frontmatter.

Context cost

Rebase Commit Push PR loads about 551 tokens when it runs. Until then it costs about 41 tokens; SKILL.md has 260 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~41
When it runs · the whole SKILL.md, loaded when a task matches
~551

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from farm-fe/farm at commit 2000ef8, republished under its MIT licence (© farm-fe). 260 words, ~551 tokens.

Download SKILL.mdSave it as .claude/skills/rebase-commit-push-pr/SKILL.md (or your agent's skills folder).
name
rebase-commit-push-pr
description
Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.
compatibility
Requires git repository with origin remote and GitHub CLI (gh) for PR checks/creation.
license
MIT
metadata.author
farm
metadata.version
1.0

Safely sync a working branch with origin/main, handle rebase conflicts, then publish and open a PR if needed.

Steps

  1. Inspect branch and working tree

    • git branch --show-current
    • git status --short
    • If there are unresolved conflicts already, stop and ask for user direction.

  2. Fetch and rebase onto main

    • git fetch origin main
    • git rebase origin/main

  3. Resolve rebase conflicts (if any)

    • Check conflicted files: git status --short
    • Resolve each conflict intentionally (do not run destructive resets).
    • Stage resolved files: git add <paths> or git rm <paths>.
    • Continue: git rebase --continue.
    • Repeat until rebase finishes or explicit user input is required.

  4. Commit user-requested local changes (only if needed)

    • If git status --short is empty, skip commit.
    • Else stage desired files (git add -A by default), then commit with a conventional message.

  5. Push branch

    • git push
    • If push is rejected after rebase, use git push --force-with-lease only when user explicitly asked for rewritten-history push.

  6. Ensure a PR exists

    • Detect current branch PR:
      • gh pr list --head "$(git branch --show-current)" --json number,title,state,url
    • If no PR exists, create one:
      • gh pr create --fill
      • If --fill fails due to missing metadata, provide explicit --title and --body.

  7. Report result

    • Branch name
    • Rebase outcome (and conflict files resolved)
    • Commit hash/title created in this run (or note "no new commit")
    • Push destination
    • PR URL (existing or newly created)

Guardrails

  • Never use git reset --hard, git checkout --, or force push without explicit user approval.
  • Do not amend commits unless explicitly requested.
  • If hooks/tests fail during commit or push, surface the first failure and stop.

© farm-fe, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/rebase-commit-push-pr of farm-fe/farm.

Open the folder on GitHubat commit 2000ef8

Compare with similar skills

Rebase Commit Push PR next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Rebase Commit Push PR compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Rebase Commit Push PR this skillfarm-fe/farm5.6k—~551Automated safety check: PassMIT
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost55k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Code Design Rationale Investigator

    cursor/plugins

    Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Migrate Internal Package into Ghost

    TryGhost/Ghost

    Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    55k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from farm-fe/farm

All 20 skills in this repo

  • Using Superpowers

    farm-fe/farm

    A skill your agent uses when starting any conversation - establishes how to find and use skills, requiring Skill tool invocation before ANY response including clarifying questions

    5.6k GitHub starsUsed in 34 repos~1.4k tokens
    Auto-check passed

  • Finishing A Development Branch

    farm-fe/farm

    A skill your agent uses when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for…

    5.6k GitHub starsUsed in 33 repos~1.8k tokens
    Auto-check passed

  • Receiving Code Review

    farm-fe/farm

    A skill your agent uses when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and…

    5.6k GitHub starsUsed in 44 repos~1.6k tokens
    Auto-check passed

  • Rust Best Practices

    farm-fe/farm

    Guide for writing idiomatic Rust code based on Apollo GraphQL's best practices handbook.

    5.6k GitHub starsUsed in 3 repos~1.1k tokens
    Auto-check passed

  • Requesting Code Review

    farm-fe/farm

    A skill your agent uses when completing tasks, implementing major features, or before merging to verify work meets requirements

    5.6k GitHub starsUsed in 37 repos~702 tokens
    Auto-check passed

  • Verification Before Completion

    farm-fe/farm

    A skill your agent uses when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any…

    5.6k GitHub starsUsed in 45 repos~1k tokens
    Auto-check passed

Works with

Categories

Questions about Rebase Commit Push PR

What does Rebase Commit Push PR do?

Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch. Rebase Commit Push PR is an agent skill from farm-fe/farm. Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.

When should I use Rebase Commit Push PR?

Rebase Commit Push PR fits situations like: tasks that involve Git workflow.

How do I install Rebase Commit Push PR in Claude Code?

Run `npx skills add farm-fe/farm --skill rebase-commit-push-pr -a claude-code`. Or copy the skill folder (.agents/skills/rebase-commit-push-pr in farm-fe/farm) into .claude/skills/rebase-commit-push-pr in your project. Claude Code loads it when a task matches its description.

How do I install Rebase Commit Push PR in Codex?

Run `npx skills add farm-fe/farm --skill rebase-commit-push-pr -a codex`. Or copy the skill folder (.agents/skills/rebase-commit-push-pr in farm-fe/farm) into .agents/skills/rebase-commit-push-pr in your project. Codex loads it when a task matches its description.

Can I use Rebase Commit Push PR in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add farm-fe/farm --skill rebase-commit-push-pr -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/rebase-commit-push-pr, .gemini/skills/rebase-commit-push-pr, .github/skills/rebase-commit-push-pr and .opencode/skills/rebase-commit-push-pr in your project.

What does Rebase Commit Push PR need to run?

Going by SKILL.md and its folder, Rebase Commit Push PR needs the command-line tools its instructions call (git and gh). Compatibility (from SKILL.md): Requires git repository with origin remote and GitHub CLI (gh) for PR checks/creation..

Does Rebase Commit Push PR access the network?

SKILL.md contains no URLs. Its commands use git and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Rebase Commit Push PR safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Rebase Commit Push PR use?

Rebase Commit Push PR is published under the MIT licence (declared in SKILL.md). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Rebase Commit Push PR use?

About 551 tokens (SKILL.md is roughly 2.2k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Rebase Commit Push PR?

Skills that share tags, products or a category with Rebase Commit Push PR: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Rebase Commit Push PR?

farm-fe (a GitHub organization) maintains it in farm-fe/farm, which has 5,594 GitHub stars. The repository holds 20 skills in this directory. The repository was last updated on September 22, 2026.

Source: farm-fe/farm on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.