Rebases Git feature branches onto origin/main and reports conflicts without resolving them.
npx skills add https://github.com/KosmoCHE/claude-plugins --skill sync-kosmoche
Please help me install this Agent Skill. Skill: sync Source: https://github.com/KosmoCHE/claude-plugins/tree/main/git-command/skills/sync Command: npx skills add https://github.com/KosmoCHE/claude-plugins --skill sync-kosmoche
The Skill helps developers keep their feature branches up to date with the latest changes by rebasing onto main, avoiding merge commits and preserving a linear history.
Rebase the current feature branch onto origin/main and verify a clean, linear history.
High-intent search queries and answers about installing and using this skill.
To maintain a linear git history, rebase your feature branch onto origin/main. This replays your commits onto the latest main, avoiding merge commits and keeping the project history clean and linear.
When git conflicts occur during a rebase, the process reports the conflicting files without auto-resolving them. This ensures deterministic guidance and lets you handle the conflict resolutions manually.
The best way to sync a feature branch with main is by rebasing onto origin/main. This synchronizes your branch with the latest changes while enforcing a clean, linear project history without merge commits.
Force pushing a rebased feature branch to a shared remote is unsafe. The process warns about unsafe pushes and advises safe alternatives to prevent overwriting teammates' commits on shared branches.
You should avoid rebasing your feature branch if it is a shared branch that others have based work on. Rebasing rewrites commit history, which can cause issues for collaborators, so shared-branch cautions apply.
adamfilliRebase the current Git branch onto the latest origin/main branch.
jcdendriteSynchronize a divergent Git feature branch with the remote default branch.
MilesChouResolve Git conflicts during rebase or merge operations.
mvillmowSyncs Git worktrees by fetching remote and rebasing or merging main into feature branches.
