Merge when preserving branch topology is required.
Resolve conflicts and re-validate locally.
Push safely (--force-with-lease only after rebase when necessary).
Safety
Never force-push protected branches.
Prefer explicit base branch in commands.
Converted and distributed by TomeVault — claim your Tome and manage your conversions.
1---2name: erinrugas-artisan-agents-git-sync3description: Git Sync Skill4---56# Git Sync Skill78## When to Apply9- User asks to sync with remote.10- Branch is behind base branch.11- Pre-PR branch cleanup is needed.1213## Workflow141. Fetch latest refs.152. Choose strategy:16 - Fast-forward pull when possible.17 - Rebase for linear history.18 - Merge when preserving branch topology is required.193. Resolve conflicts and re-validate locally.204. Push safely (`--force-with-lease` only after rebase when necessary).2122## Safety23- Never force-push protected branches.24- Prefer explicit base branch in commands.2526---27> Converted and distributed by [TomeVault](https://tomevault.io/claim/erinrugas) — claim your Tome and manage your conversions.28<!-- tomevault:4.0:skill_md:2026-04-13 -->
Run npx skillmds@latest add tomevault-io/erinrugas-artisan-agents-git-sync in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.
Git Sync Skill It is listed under Coding & Dev Tools on SkillMD.
This skill has not completed SkillMD's automated safety review yet. Independent scanners report: SkillSpector: PASS, Skill Scanner: PASS. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.
This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.
Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.
tomevault-io (@tomevault-io) published this skill. Their other Agent Skills are listed on their SkillMD profile.