What problem does it solve? Shipping local work on the main branch involves repetitive git steps—checking status, pulling with rebase, resolving conflicts, staging files, writing commit messages, and pushing. This Skill automates that entire sequence safely in one command. ## Core Features & Use Cases - Branch Safety Check: Verifies you are on main before doing anything and stops to ask if you are not. - Rebase-Based Sync: Pulls the latest origin/main with git pull --rebase and resolves merge conflicts proactively, inspecting both sides of each conflict before resolving. - Intentional Commits: Stages only relevant files explicitly by path and generates Conventional Commits messages from session knowledge or the diff. - Use Case: After finishing a feature fix with several uncommitted changes, invoke $ship to pull the latest main, commit your work with a proper message, and push to origin in one flow. ## Quick Start Ask the agent to ship the current main branch by invoking $ship with an optional commit message context.