Rebase the current branch onto a target branch with conflict triage guidance.
npx skills add https://github.com/jMerta/codex-skills --skill rebase-assistant
Please help me install this Agent Skill. Skill: rebase-assistant Source: https://github.com/jMerta/codex-skills/tree/main/rebase-assistant Command: npx skills add https://github.com/jMerta/codex-skills --skill rebase-assistant
Rebase operations can be error-prone and disruptive. This Skill provides a safe, step-by-step workflow to rebase the current branch onto a target branch, with built-in guidance for conflict triage and resolution.
Rebase the current branch onto the target branch, then resolve any conflicts using the guided workflow.
High-intent search queries and answers about installing and using this skill.
A safe git rebase requires preflight checks to confirm a clean working tree and up-to-date remotes before applying commits. This prevents data loss by enforcing a non-destructive completion flow using standard Git commands.
The best way to handle git rebase conflicts is using a guided workflow with built-in conflict triage and per-file resolution strategies. This ensures safe conflict resolution and provides continuation steps until the rebase is complete.
To resolve per-file conflicts during a branch rebase, follow a guided conflict triage workflow that provides specific resolution strategies for each file. This allows you to address conflicts systematically and continue the rebase safely.
Preflight checks required before rebasing onto a target branch include verifying a clean working tree and ensuring remotes are up to date. These checks guarantee a safe baseline before the rebase operation begins.
Yes, you can update a feature branch by rebasing onto a shared history without disruptions by using a step-by-step workflow with completion verification. This non-destructive flow integrates work safely using standard Git commands.
Your rebase fails when the working tree is not clean because preflight checks block the operation to prevent data loss. A clean working tree is required to ensure a safe, non-destructive rebase process.
vladpolewoiRebase a feature branch onto the latest base branch commits.
JacobPEvansRebase pull requests onto main with signed commits and GitHub API checks.
drnMerge the current Git branch into master via GitHub Pull Request.
asgarovfProvide Git commands for branching, merging, rebasing, and conflict resolution.
