Rebase the current Git branch onto the latest origin/main branch.
npx skills add https://github.com/adamfilli/happy-simulator --skill rebase-adamfilli
Please help me install this Agent Skill. Skill: rebase Source: https://github.com/adamfilli/happy-simulator/tree/main/.claude/skills/rebase Command: npx skills add https://github.com/adamfilli/happy-simulator --skill rebase-adamfilli
This Skill helps developers keep their feature branches up-to-date with the main development line, preventing merge conflicts and ensuring a cleaner commit history.
main branch.main.main to ensure a smooth merge.Use the rebase skill to update the current branch with the latest changes from origin/main.
High-intent search queries and answers about installing and using this skill.
To rebase your current Git branch, this Skill pulls the latest changes from the origin main branch and reapplies your commits on top, ensuring clean integration and a linear commit history.
You need to rebase a feature branch before submitting a pull request to integrate the latest main branch changes, preventing merge conflicts and ensuring a smooth, clean merge process.
Yes, this Git rebase workflow requires a remote repository named origin with a main branch, along with Git command-line tools installed locally to execute the branch update and rebase operations.
The best way to handle merge conflicts during a branch rebase is to use this Skill, which guides users through conflict resolution step-by-step while reaplying commits onto the updated main branch.
Rebasing a branch instead of merging keeps your commit history clean by reapplying your feature commits directly on top of the updated main branch, avoiding the unnecessary merge commits that standard merges introduce.
No, you cannot use this rebase skill without Git command-line tools, as the workflow depends on local Git commands to fetch updates from origin and reapply your branch commits onto the main branch.
dyoshikawaSwitch to the main branch and pull with pruning from origin.
dobrinz123Push branches, create pull requests, and monitor merge status.
zzxtbetaMerge base branch, run tests, bump VERSION, and create a PR.
mvillmowSyncs Git worktrees by fetching remote and rebasing or merging main into feature branches.