Add sync with main step to ship command

[vurhanau]

Summary

• Added a new Step 5 to the /ship command that fetches and rebases the feature branch onto origin/main before pushing
• Includes conflict resolution guidance: resolve file by file, stage, and continue rebase; abort and report to user if too complex

Test plan

• Build passes (make build)
• Tests pass (make test)

🤖 Generated with Claude Code