Rebase a Git branch onto a target branch and resolve conflicts.
npx skills add https://github.com/JHostalek/dotclaude --skill rebase-jhostalek
Please help me install this Agent Skill. Skill: rebase Source: https://github.com/JHostalek/dotclaude/tree/main/skills/rebase Command: npx skills add https://github.com/JHostalek/dotclaude --skill rebase-jhostalek
This Skill updates branch history without merging, producing a clean linear branch that is ready to push while managing conflicts and post-rebase validation.
Use the rebase skill to rebase the current branch onto the specified target branch, resolve conflicts, run quality gates, reconcile migrations, and push the result safely.
High-intent search queries and answers about installing and using this skill.
Git rebase updates your current branch onto a target branch to produce clean linear history. It applies documented conflict heuristics to resolve rebase conflicts and reports the affected commits.
Migration reconciliation after a git rebase re-chains migration files and applies them to your local database. This ensures database schema changes remain sequentially valid across the updated branch history.
Yes, you need to run quality gates after rebasing because the rebase process bypasses pre-commit hooks. The skill inspects and runs your repository's configured quality gates to validate the codebase.
Force-push a rebased branch using force-with-lease to safely synchronize with the remote. This prevents overwriting concurrent remote commits while pushing your updated linear history.
Yes, you can rebase the current branch onto a specified target branch. If no target is provided, the rebase defaults to the repository's master or main branch.
LukasStricklerGenerate Conventional Commits messages from repository history and local configuration.
haryelramalhoResolve git rebase conflicts while preserving branch changes.
MicrockReview code for defensive patterns, special cases, and deep nesting.
matsenSquash-merge a PR and clean up local and remote branches.
