skills.rest
cedricfarinazzo
cedricfarinazzoCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

merge-update-pr

Rebase a PR branch on main and push only when a merge commit is created.

Updated May 16, 2026
Search Tags:#git#merge#rebase#lint#ci#conflicts
One-click install
npx skills add https://github.com/cedricfarinazzo/agile-skills --skill merge-update-pr
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-update-pr
Source: https://github.com/cedricfarinazzo/agile-skills/tree/main/agile-merge-review/skills/merge-update-pr
Command: npx skills add https://github.com/cedricfarinazzo/agile-skills --skill merge-update-pr

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Branch drift and messy histories in PR workflows during development are mitigated by a safe, repeatable process to rebase PR branches on main and produce a verifiable merge commit.

Core Features & Use Cases

  • Controlled rebase of a PR onto main with --no-ff to preserve a clean merge history.
  • Intelligent conflict detection and guided resolution to preserve changes from both sides.
  • Lint-after-rebase gate to ensure code quality before pushing.
  • No-op merge handling to avoid unnecessary pushes when the branch is already up to date.

Quick Start

Invoke the merge-update-pr skill on a PR branch to rebase onto main, resolve conflicts when they arise, run post-merge lint checks, and push only if a merge commit is created.

Frequently Asked Questions about merge-update-pr

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

FAQPage Schema
How do I rebase a PR branch onto main and push only after a clean merge?▼

To rebase a PR branch onto main and push safely, you rebase with --no-ff, resolve conflicts, run lint checks, and push only when a verifiable merge commit is created.

What is the best way to handle git merge conflicts in a collaborative PR workflow?▼

Handling git merge conflicts in a PR workflow involves intelligent conflict detection during rebase and guided resolution to preserve changes from both sides before pushing.

How does a lint-after-rebase gate ensure a stable CI-friendly merge?▼

A lint-after-rebase gate ensures a CI-friendly merge by running code quality checks immediately after rebase and before pushing, preventing broken code from entering main.

Why does my git rebase push fail when the PR branch is already up to date?▼

A git rebase push does not occur when the PR branch is already up to date because explicit no-op merge handling avoids unnecessary pushes unless a merge commit is created.

Can I preserve a clean merge history while resolving branch drift in git?▼

You can preserve a clean merge history during branch drift by using a controlled rebase with --no-ff, which produces a verifiable merge commit instead of a fast-forward.

Do I need to run lint checks before pushing a rebased git branch to CI?▼

You need to run lint checks after rebase and before pushing to CI to validate code quality, ensuring the rebased branch remains stable and does not break the pipeline.

Related Skills

Explore More Software Engineering Skills→
BailipaBailipa
4

setup-pre-commit

Automate pre-commit hook setup with Husky, lint-staged, and Prettier.

Community
Intermediate
DuySeuDuySeu
1

gsd-ship

Push verified branches, create PRs, trigger reviews, and track merges on GitHub.

Community
Advanced
HomericIntelligenceHomericIntelligence
18

quality-run-linters

Run Mojo format, markdownlint, and pre-commit hooks for code quality checks.

Official
Intermediate
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced