skills.rest
kriscendobot
kriscendobotCOMMUNITY
Explore all skills by this author →
GitHub

rebase-before-followup

Rebase pull request branches onto their base before pushing fix-up commits.

3|2|Updated May 12, 2026
Search Tags:#automation#git#code review#version control#pull request#rebase
One-click install
npx skills add https://github.com/kriscendobot/garden --skill rebase-before-followup
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-before-followup
Source: https://github.com/kriscendobot/garden/tree/main/skills/rebase-before-followup
Command: npx skills add https://github.com/kriscendobot/garden --skill rebase-before-followup

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill prevents pull requests from becoming stale or conflicting with the base branch by ensuring all follow-up commits are applied on top of the most recent code.

Core Features & Use Cases

  • Automated Rebase: Automatically rebases PR branches onto the current base before pushing fix-up commits.
  • Conflict Prevention: Uses force-with-lease to ensure safe updates without overwriting concurrent work.
  • Use Case: When a reviewer requests changes on a PR that has fallen behind the main branch, this skill ensures the fix-up commits are applied to the latest version of the code, keeping the history linear and clean.

Quick Start

Use the rebase-before-followup skill to synchronize the current pull request branch with the latest upstream changes before applying review feedback.

Frequently Asked Questions about rebase-before-followup

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I keep my pull request branch updated with the base branch before pushing fix-up commits?▼

You can keep a pull request branch updated by rebasing it onto the current base branch before pushing new commits. This ensures fix-ups are applied on top of the latest code, maintaining a clean and linear commit history.

Why does my pull request have a messy commit history after addressing code review feedback?▼

Pull request history becomes messy when follow-up commits are applied to a stale branch. Rebasing your PR branch onto the latest base before pushing review feedback fix-ups prevents conflicts and keeps the history linear.

Can I safely force push a rebased git branch without overwriting concurrent work?▼

You can safely force push a rebased git branch by using the force-with-lease protocol. This safety mechanism prevents accidental data loss by ensuring you do not overwrite concurrent work from other contributors.

Do I need git command-line access to automate rebasing pull request branches?▼

Yes, you need git command-line access to perform automated rebase operations on pull request branches. This access is required to execute the version control commands that synchronize your PR with upstream changes.

What is the best way to prevent conflicts when applying builder corrections to an outdated PR?▼

The best way to prevent conflicts when applying builder corrections is to rebase the outdated PR branch onto the most recent base branch first. This synchronizes the codebase before adding new commits, avoiding merge conflicts.

Related Skills

Explore More Software Engineering Skills→
bybren-llcbybren-llc
395

git-advanced

Execute advanced git operations for rebasing, bisecting, cherry-picking, and conflict resolution.

Official
Advanced
byunghak-dablebyunghak-dable

github-pr-push

Push code changes and create or update GitHub Pull Requests with automated checks.

Community
Advanced
vikas-gits-goodvikas-gits-good

release-patterns

Standardize pull request creation and CI/CD validation in rebase-first workflows.

Community
Intermediate
ilonatommyilonatommy
3

commit-squashing

Consolidate multiple Git commits into a single commit using rebase, reset, or merge strategies.

Community
Intermediate