Rebase the current branch onto origin/main after fetching origin.
npx skills add https://github.com/zmchenry/dotfiles --skill update-from-main
Please help me install this Agent Skill. Skill: Update from Main Source: https://github.com/zmchenry/dotfiles/tree/main/.claude/skills/update-from-main Command: npx skills add https://github.com/zmchenry/dotfiles --skill update-from-main
This Skill helps developers keep their feature branches up-to-date with the latest changes from origin/main by performing a git rebase, reducing conflicts and drift between local work and the main branch.
Check the current branch name Ensure the working directory is clean (no uncommitted changes) Fetch latest changes from origin Rebase current branch onto origin/main If conflicts occur, resolve them or abort and retry
High-intent search queries and answers about installing and using this skill.
Rebasing onto origin/main integrates upstream changes without creating merge commits. The workflow verifies a clean working tree, fetches origin, and executes git rebase to sync your local feature branch.
Syncing a feature branch with upstream changes is best done via a rebase onto origin/main. This approach replays your local commits on top of the latest main branch updates, reducing drift and avoiding extra merge commits.
Git rebase detects conflicts during the update from main and guides you through resolution. If conflicts occur, you can resolve them step-by-step or abort the rebase and retry safely.
Yes, you need a clean working directory before rebasing onto origin/main. The safe workflow checks for uncommitted changes and fetches origin only after verifying the working tree is clean to prevent data loss.
Using rebase instead of merge to update your local branch keeps your commit history linear by avoiding merge commits. Rebasing onto origin/main replays your local changes directly on top of upstream updates, reducing branch drift.
If your git rebase from origin/main fails due to conflicts, the workflow guides you through conflict resolution. You can manually fix the conflicting files and continue, or abort the rebase to return to your original state.
cbleckerSync a local Git branch with its remote using fork-aware fetch and merge.
AbildtoftRebase the current branch onto the latest base branch and force-push with --force-with-lease.
yash-gargResolve in-progress git merge and rebase conflicts by analyzing changes and completing integration workflows.
jamescMerge origin/main into the current branch and resolve conflicts.
