Replay feature branch commits onto an updated base with conflict resolution.
npx skills add https://github.com/dhnt/dhnt --skill rebase-dhnt
Please help me install this Agent Skill. Skill: rebase Source: https://github.com/dhnt/dhnt/tree/main/catalog/md/commit/rebase Command: npx skills add https://github.com/dhnt/dhnt --skill rebase-dhnt
Rebase solves the problem of keeping your branch history clean and up to date when the base branch has advanced, by replaying your work onto the latest base.
Rebase your feature branch onto the updated main branch and then force-push it safely with --force-with-lease after resolving any conflicts and running the build and tests.
High-intent search queries and answers about installing and using this skill.
To rebase your feature branch, Git replays your commits on top of the updated main branch. This maintains a clean linear history by shifting your work to the latest base before integration.
Squashing WIP commits before a pull request uses interactive rebase to condense work-in-progress commits into atomic ones. This creates a review-ready, clean commit set for your pull request.
Conflict resolution during a git rebase requires deliberately fixing merge conflicts before continuing. You must resolve conflicting changes safely, then continue replaying your remaining commits onto the base.
You should use force-with-lease when pushing a rebased branch to avoid overwriting others' work. It safely updates the remote history only if no upstream changes occurred since your last fetch.
You need to rebase instead of merging when the base branch has advanced during your work and you require a clean linear history. Replaying commits onto the updated base tests your changes against current code.
You should not rebase a branch without running tests afterward. Replaying commits onto an updated base requires build and test verification to ensure your changes function correctly against the new base code.
raineRebase current branch onto main or specified origin branches with conflict resolution.
tnezCreates a pull request from the current branch to main using GitHub CLI.
Obsidian-OwlExecute configured build and test commands to verify code integrity.
MelvynxAutomate Git branch merges with context-aware conflict resolution.
