Git Sync — Git skill for Claude Code
Performs a safe git rebase and resolves conflicts systematically.
How to install Git Sync
Installs to ~/.claude/commands/pedrol-cmd-brain-drin-git-sync.md
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/pedrol-cmd/brain-drin/HEAD/.claude/commands/git-sync.md -o ~/.claude/commands/pedrol-cmd-brain-drin-git-sync.md Restart Claude Code, or start a new session, for it to be picked up.
What Git Sync does
description: Performs a safe git rebase and resolves conflicts systematically.
/git-sync
Maintains a clean git history without the headache of manual conflict resolution.
Usage
- Runs the rebase onto the target branch.
- Automatically identifies and suggests fixes for conflicts.
- Verifies build state before finishing.
Specialist Agent
@fullstack-dev
Alternatives in Git
- Epic Sync — Sync epic issue bodies, labels, and local coordination snapshots from GitHub 243.5k ★
- Push And Release — Git pull, resolve conflicts, push, fix hook errors, then release 1.6k ★
- GitHub Review PR — Use when a PR needs full review — resolves merge conflicts with the base first, then fixes CI failures, then a 1.5k ★
Full documentation available on GitHub
View Source RepositoryRelated Skills
Git Rebase
Rebases onto origin/main (or origin/master) and resolves conflicts
Resolve Conflict
You are resolving git merge/rebase conflicts. Follow this procedure, and briefly tell the user what you're doi
Rebase On Main
Rebase the current branch on origin/main and resolve any conflicts.
Rebase PR
Use when: rebasing a PR branch onto main and the rebase produces conflicts. Triggers on: rebase origin/main, r
Safe Pull
安全地從 origin/main 拉取最新內容到本機,自動 stash 本地未 commit 的修改,rebase 完成後再還原
Stack Sync
Cascade-rebase the current branch and all its descendants onto the new main, after a parent PR has merged. Use
Related Agents
PR Health Checker
Use this agent when checking PR status for CI failures, merge conflicts, stale reviews, rebase status, or othe
Merge Resolver
Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict
Git Reconciler
Git branch reconciliation specialist using git and the gh CLI. Use whenever there are merge conflicts, a diver