Home / ronaknnathani / relay · skills/rebase/SKILL.md · GitHub

rebase skillA

rebase is agent-read markdown (skill) from ronaknnathani/relay: Use when you need to rebase the current branch onto main, resolve merge conflicts, and force-push.

Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns the same grade.

What the file says

# Rebase — Rebase, Fix Conflicts, Push

Rebase the current branch onto the base branch (default: `main`), resolve any merge conflicts, and force-push.

## Steps

### 1. Determine Base Branch

- If `$ARGUMENTS` contains a branch name, use it as the base.
- Otherwise, default to `main`.

### 2. Pre-check Working Tree

```bash
git status --porcelain
```

If output is non-empty, the working tree is dirty. Abort and report to the user:

```
Working tree has uncommitted changes. Commit or stash before rebasing:
  <output of git status --porcelain>
```

Do NOT auto-stash — too easy to lose work.

### 3. Fetch Latest

```bash
git fetch origin <BASE_BRANCH>
```

### 4. Rebase

```bash
git rebase origin/<BASE_BRANCH>
```

### 5. Handle Conflicts

If the rebase stops with conflicts:

1. Run `git diff --name-only --diff-filter=U` to list conflicted files
2. For each conflicted file:
   - Read the file to understand the conflict markers
   - Resolve the conflict by understanding both sides (ours = current branch work, theirs = base branch changes)
   - Prefer keeping our changes where they don't conflict with upstream intent
   - If unsure about a conflict, ask the user
…

Read the whole file at its exact version.

How to install

Latest version
mdr add ronaknnathani/relay/rebase@git:20260629.9a6d3b4
Exact content
mdr add ronaknnathani/relay/rebase@sha256:c4354cc660894d58

Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.

Badge

mdr badge

[![mdr](https://markdownregistry.com/badge/art_vny5dcaxsaqgxkk6.svg)](https://markdownregistry.com/a/art_vny5dcaxsaqgxkk6)

1 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260629.9a6d3b4 latest2026-06-29 9a6d3b4 2,587 BA view · diff
git:20260629.99be5fe2026-06-29 99be5fe 2,573 BA view

Audit of the latest version

A  17 of 17 checks passed. Deterministic, no model, same answer every run.
  • pass: Frontmatter block present
  • pass: Frontmatter declares a name
  • pass: Frontmatter declares a description
  • pass: Size between 200 bytes and 200 KB (2587 bytes)
  • pass: No zero-width or bidi control characters
  • pass: No instruction hidden inside an HTML comment
  • pass: No link to an exfiltration or paste host
  • pass: No credential-shaped string
  • pass: No instruction to send local credentials anywhere
  • pass: No text hidden with inline styles
  • pass: No prompt-injection phrasing
  • pass: No curl or wget piped into a shell
  • pass: No recursive delete of root, home or parent
  • pass: No instruction to read or print local credentials
  • pass: No base64 blob over 200 characters
  • pass: No link to a raw IP address
  • pass: No script tag

Source

GitHub

ronaknnathani/relay · 3 stars · license MIT · pushed 2026-09-24 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_vny5dcaxsaqgxkk6
GET https://markdownregistry.com/api/v1/resolve?ref=ronaknnathani/relay/rebase
GET https://markdownregistry.com/api/v1/blob/c4354cc660894d5864a2f0aeca21d130343c23b24052b27aa2c9f14859d618ee

Your agent does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.

More from ronaknnathani/relay

build-write-like-me skill
ronaknnathani/relay · skills/build-write-like-me/SKILL.md · Use this skill whenever the user wants to capture, clone, or codify their own (or someone's) writing voice into a…
git:20260811.a9d417f · audit A · 3 stars
clarify skill
ronaknnathani/relay · skills/clarify/SKILL.md · Turn a vague or underspecified task into a crisp requirements + testable acceptance-criteria document by closing the…
git:20260629.7380310 · audit A · 3 stars
commit skill
ronaknnathani/relay · skills/commit/SKILL.md · Create a single well-formed git commit from the working changes, following the repo's AGENTS.md and recent…
git:20260703.d975737 · audit A · 3 stars
deliver-pr skill
ronaknnathani/relay · skills/deliver-pr/SKILL.md · Deliver one change end to end as a single pull request — clarify → plan → implement → simplify → review → validate →…
git:20260902.0a12af0 · audit A · 3 stars
explore skill
ronaknnathani/relay · skills/explore/SKILL.md · Build a verified, read-only understanding of a codebase or a slice of it — entry points, code flow, architecture…
git:20260629.a497d9d · audit A · 3 stars
implement skill
ronaknnathani/relay · skills/implement/SKILL.md · Execute an implementation plan (from `plan`) task by task, writing the code and tests and leaving the system green at…
git:20260703.d975737 · audit A · 3 stars
open-pr skill
ronaknnathani/relay · skills/open-pr/SKILL.md · Stage, commit, push, and open a pull request following the author's repository and AGENTS.md conventions — repo-style…
git:20260703.d975737 · audit A · 3 stars
plan skill
ronaknnathani/relay · skills/plan/SKILL.md · Turn a clarified requirements artifact into a concrete, executable implementation plan — a decisive architecture…
git:20260629.7380310 · audit A · 3 stars
pr-fix skill
ronaknnathani/relay · skills/pr-fix/SKILL.md · Bring a PR to mergeable — fix CI failures, address review comments, and resolve merge conflicts. Runs either from a…
git:20260924.f980c5b · audit A · 3 stars
pr-monitor skill
ronaknnathani/relay · skills/pr-monitor/SKILL.md · Handle one pull request attention event end to end — read the watcher digest, triage it, delegate the fixing to pr-fix…
git:20260902.6e57c00 · audit A · 3 stars
relay-archive skill
ronaknnathani/relay · skills/relay-archive/SKILL.md · Use when a project's PR is merged and you want to clean up the worktree while preserving notes and plans
git:20260630.3bc1f89 · audit A · 3 stars
relay-status skill
ronaknnathani/relay · skills/relay-status/SKILL.md · Use when checking the status of active or archived development projects
git:20260630.3bc1f89 · audit A · 3 stars

Every file in ronaknnathani/relay

Other files named rebase

rebase skill
flurdy/agent-skills · skills/rebase/SKILL.md · Rebase the current branch onto an updated main, an updated stacked parent, or main after the parent PR merged. Proves…
v1.0.0 · audit A · 9 stars

Browse by kind, by grade A, or by owner.