Skip to content
cccskills
FreePublished on GitHub

rebase

Rebase the current branch with flexible target options. Use when you need to rebase on main, a specific branch, or a remote branch, with intelligent conflict handling.

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md1.3 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

Rebase

Rebase the current branch.

Arguments

  • No arguments: rebase on local main
  • origin: fetch origin, rebase on origin/main
  • origin/branch: fetch origin, rebase on origin/branch
  • branch: rebase on local branch

Steps

  1. Parse arguments

    • No args → target is "main", no fetch
    • Contains "/" (e.g., "origin/develop") → split into remote and branch, fetch remote, target is remote/branch
    • Just "origin" → fetch origin, target is "origin/main"
    • Anything else → target is that branch name, no fetch
  2. Fetch if needed

    git fetch <remote>
    
  3. Rebase

    git rebase <target>
    
  4. Handle conflicts (if any)

  5. Continue until complete

Handling Conflicts

  • BEFORE resolving any conflict, understand changes made to each conflicting file in the target branch
  • For each conflicting file:
    git log -p -n 3 <target> -- <file>
    
  • Goal: preserve BOTH target branch changes AND our branch's changes
  • After resolving each conflict:
    git add <file>
    git rebase --continue
    
  • If a conflict is too complex or unclear, ask for guidance before proceeding

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Add an iOS App Clip target to an Expo app. Use when the user mentions App Clip, AASA, apple-app-site-association, appclips, smart app banner, or wants to ship a lightweight iOS Clip invoked from a URL alongside their parent app.

The English summary is being prepared. Showing the original description.

heyAyushh/stacc3Updated Sep 21, 2026

Automates browser interactions for web testing, form filling, screenshots, and data extraction. Use when the user needs to navigate websites, interact with web pages, fill forms, take screenshots, test web applications, or extract information from web pages.

The English summary is being prepared. Showing the original description.

heyAyushh/stacc3Updated Sep 21, 2026

Add Agentation visual feedback toolbar to a Next.js project

The English summary is being prepared. Showing the original description.

heyAyushh/stacc3Updated Sep 21, 2026

Apple's approach to interface design and fluid, physical motion, translated for the web. Use when building or reviewing gesture-driven UI, spring animations, drag/swipe/sheet interactions, momentum and interruptible transitions, translucent materials and depth, typography (optical sizing, tracking, leading), reduced-motion, or the design foundations (feedback, spatial consistency, restraint) behind Apple-style interfaces.

The English summary is being prepared. Showing the original description.

heyAyushh/stacc3Updated Sep 21, 2026

Derive and implement first-principles audio-coupled haptic and kinetic UI feedback. Use when designing, reviewing, or coding haptics/audio for mobile apps, native iOS/Android, React Native/Expo, SwiftUI, games, detent pickers, toggles, sliders, page curls, scroll gestures, wallet/signature flows, Solana transactions, backend/realtime state changes, confirmations, settlements, and semantic UI events where feedback should follow signal math instead of ad hoc vibration calls.

The English summary is being prepared. Showing the original description.

heyAyushh/stacc3Updated Sep 21, 2026

Babysit a GitHub pull request during a user-approved monitoring window by polling review comments, CI checks/workflow runs, and mergeability state. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and report fresh review feedback. Use when the user asks Codex to monitor a PR, watch CI, handle review comments, or keep an eye on failures and feedback on an open PR.

The English summary is being prepared. Showing the original description.

heyAyushh/stacc3Updated Sep 21, 2026

See all skills by heyAyushh

Report a problem with this skill