What problem does it solve? Keeping a feature branch up to date with a fast-moving develop or main branch is error-prone: developers forget to fetch, merge the wrong base, hit conflicts without a plan, or accidentally rebase against project policy. This Skill automates the entire branch-sync workflow in the mj-agent repository with guardrails and human checkpoints. ## Core Features & Use Cases - Three sync modes: dev-time sync (work branch merges origin/develop or origin/main), hotfix back-sync (develop merges origin/main after a hotfix release), and self-update (any branch pulls its own origin counterpart for multi-machine or collaborator scenarios). - Automatic environment detection: derives the correct base branch from the current branch prefix (feature/bugfix/documentation/maintain use develop; hotfix uses main) and blocks cross-branch merges on main. - Structured conflict handling: presents divergence counts and incoming commits before merging, proposes conflict resolutions for user approval, and supports stash/pop around the merge. - Use Case: A teammate pushed new commits to develop while you were mid-feature. Ask to sync your branch, and the Skill fetches origin, shows how far behind you are, merges origin/develop, and helps resolve any conflicts before you continue. ## Quick Start Ask the assistant to sync the latest develop changes into my current working branch in mj-agent.
