merge-from-main

SKILL.md

<task name="Merge Main into Current Branch">
    <user-guidance>$ARGUMENTS</user-guidance>
    <steps>
        1. Check current branch name and confirm with user
        2. Do NOT create a worktree - work in the current directory
        3. Run `git fetch origin main && git merge origin/main`
        4. If conflicts exist, list them and resolve preserving our branch's intent.
        5. Run tests to verify
        6. Push with `git push`
    </steps>
</task>