Create a backup branch and guide conflict resolution during Git rebases.
npx skills add https://github.com/usesofia/agents-toolkit --skill git-rebase-usesofia
Please help me install this Agent Skill. Skill: git-rebase Source: https://github.com/usesofia/agents-toolkit/tree/main/skills/git-rebase Command: npx skills add https://github.com/usesofia/agents-toolkit --skill git-rebase-usesofia
Safely rebase branches by automatically creating backups and guiding conflict resolution to preserve history and recover from failures.
Use the git-rebase skill to rebase your feature branch onto the base branch with automatic backup and conflict verification.
High-intent search queries and answers about installing and using this skill.
To safely rebase a feature branch, the workflow automatically creates a timestamped backup branch before applying changes, allowing you to preserve history and rollback if the rebase fails or produces unexpected results.
Resolving Git rebase conflicts involves a guided workflow that detects conflicts, provides step-by-step resolution instructions, and offers rollback options to restore the original branch state from the automatic backup.
Yes, starting a Git rebase requires a clean working directory. The safety-oriented workflow enforces this prerequisite to ensure the rebase applies correctly and the backup-verify pattern functions without interference.
The backup branch recovery process retains timestamped backup branches after rebase operations, enabling you to rollback the feature branch to its original state for both failure recovery and auditability.
You should avoid Git rebase when merge policies could be violated, as the workflow provides safety-oriented messaging to prevent operations that conflict with project rules, or if you need a completely clean working directory.
weebcoder101Automate Git feature branch creation, pull requests, and CI checks.
heman1033p-createSwitch to main, pull latest, and delete merged feature branches.
trystan2kGuide Git workflows for atomic commits, rebasing, blame, and bisect.
latestaiagentsGuides Git rebase operations with conflict resolution and recovery via reflog.
