Update Branch — Git skill for Claude Code
Merge main into the current feature branch.
How to install Update Branch
Installs to ~/.claude/skills/zarifaziz-agent-scripts-update-branch/SKILL.md
mkdir -p ~/.claude/skills/zarifaziz-agent-scripts-update-branch && curl -fsSL https://raw.githubusercontent.com/zarifaziz/agent-scripts/HEAD/commands/update-branch.md -o ~/.claude/skills/zarifaziz-agent-scripts-update-branch/SKILL.md Restart Claude Code, or start a new session, for it to be picked up.
What Update Branch does
allowed-tools: Bash(git *), Bash(cargo *), Bash(just *), Bash(dart *), Bash(flutter *), Bash(flutter_rust_bridge_codegen *), Read, Edit, Write, Glob, Grep, Agent description: Merge main into the current feature branch
Context
- Current branch: !
git branch --show-current - Current status: !
git status --short - Main branch latest: !
git log origin/main --oneline -1 - Branch divergence: !
git rev-list --left-right --count origin/main...HEAD
Your task
Merge `origin/main` into
Alternatives in Git
- Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
- OSS PR — Commit + PR workflow for open source contributions: auto-creates a user-prefixed branch when on main/master, t 19.7k ★
- Merge Command — Finalize worktree work: update docs, commit, merge to main, clean up 1.3k ★
Full documentation available on GitHub
View Source RepositoryRelated Skills
Compare Docs
Compare document generation between main and the current feature branch.
PR Merged
Post-merge cleanup — checkout main, pull latest, delete the feature branch, and close the linked work item.
Merge
Merge a feature branch into current branch
Cdd Merge Base
Integrate the current state of the base branch into the feature branch. Two phases: a dry-run conflict assessm
Gl Mr
Open a draft GitLab merge request for the current branch (push, title and description from the commits, "Close
Ship
Create a pull request from the current working branch to main, ensure the version is bumped, and draft a GitHu
Related Agents
Compare Branch
Compare current branch vs main/staging — changes, risk assessment, merge readiness.
Develop
Implements a fix or feature for a single GitHub issue in an isolated worktree. Iterates up to 3 cycles (merge
Gitnexus Branch Hygiene Reviewer
GitNexus branch hygiene and mergeability reviewer. Use to classify merge state, conflicts, stale branches, mer