| name | git-pull-main |
| description | Bring the current git branch up to date with commits from the main branch. Use when the user asks to pull latest main, sync/refresh the branch, rebase onto main, or merge main into a feature branch. |
$git-pull-main skill
Overview
Update the checked out branch from main with a small helper script instead of rebuilding the git sequence from scratch. Prefer rebase for a clean linear history, and switch to merge only when the user or repository workflow requires it.
Workflow
-
Confirm the repository state first.
- Run
git status --short.
- Run
git branch --show-current.
- Stop if the user is already on
main.
-
Choose the update strategy.
- Default to
rebase.
- Use
merge when the user explicitly asks to merge, the branch is already shared and history should not be rewritten, or the repository conventions prefer merge commits.
-
Run the helper script.
python3 "${CLAUDE_SKILL_DIR}/scripts/update_branch_from_main.py"
-
Add flags only when needed.
python3 "${CLAUDE_SKILL_DIR}/scripts/update_branch_from_main.py" --strategy merge
python3 "${CLAUDE_SKILL_DIR}/scripts/update_branch_from_main.py" --base-branch main --remote origin
python3 "${CLAUDE_SKILL_DIR}/scripts/update_branch_from_main.py" --allow-dirty
-
If git reports conflicts, stop normal automation and guide the user through resolution.
- For rebase conflicts: resolve files,
git add <files>, then git rebase --continue.
- For merge conflicts: resolve files,
git add <files>, then git commit.
- If the user wants to cancel:
git rebase --abort or git merge --abort.
Guardrails
- Refuse to run on
main.
- Refuse to run with a dirty working tree unless the user explicitly accepts
--allow-dirty.
- Fetch
origin/main before changing history.
- Prefer
origin/main over a stale local main.
- Show the exact git commands before execution so the user can see the plan.
Script behavior
The helper script:
- verifies the current branch is not the base branch
- checks whether the working tree is clean unless
--allow-dirty is passed
- fetches the chosen base branch from the chosen remote
- rebases onto
origin/main by default, or merges origin/main when requested
- exits immediately on the first git failure and leaves the repository in git's native conflict state for manual resolution
