Guide safe Git rebases with backup and conflict resolution steps.
npx skills add https://github.com/Archive228/loopkit --skill rebase-safely-archive228
Please help me install this Agent Skill. Skill: rebase-safely Source: https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely Command: npx skills add https://github.com/Archive228/loopkit --skill rebase-safely-archive228
This Skill provides a set of guidelines and commands to safely rebase, squash, or rewrite Git history without the risk of losing work or breaking shared branches.
--force-with-lease for pushing to avoid data loss.Use the rebase-safely skill to safely rebase your branch onto the main branch with ./run.sh rebase-safely main.
High-intent search queries and answers about installing and using this skill.
To safely rebase a git branch, create a backup branch first to establish a rollback point, then rebase onto the target base branch and resolve conflicts one commit at a time to prevent history loss.
The safest approach to shared git history is to avoid rewriting it entirely. If you must rewrite history, use force push with lease to avoid overwriting others' work and causing branch conflicts.
To resolve git rebase conflicts, address each conflict one commit at a time. The process emphasizes resolving issues sequentially during the rebase operation to maintain history integrity and prevent data loss.
Using force push with lease when rebasing prevents data loss by checking that your remote branch matches the expected state before overwriting. It stops you from accidentally erasing changes pushed by others.
Rebasing a branch already pushed to a shared remote is discouraged due to shared history integrity. If absolutely necessary, you must use force push with lease and ensure teammates are aware to avoid causing pain.
cbleckerRebase a feature branch onto an updated base branch with conflict guidance.
AbildtoftRebase the current branch onto the latest base branch and force-push with --force-with-lease.
theslashdojoReplay commits onto a new base with interactive rebase and autosquash.
Knuckles-TeamAutomate Git history fixes using rebase, cherry-pick, and bisect workflows.