Pull

This automates the full merge-based workflow for syncing a feature branch with origin/main, including conflict resolution strategy. It fetches, pulls your current branch first to catch remote updates, then merges origin/main with zdiff3 conflict style for better context. The conflict resolution guidance is the real meat here: it walks through understanding intent on both sides, using git diff incantations to compare base/ours/theirs, and making semantic decisions before touching code. It's opinionated about when to ask users (almost never) and includes practical rules like resolving source files before regenerating artifacts. If you're tired of Claude stopping mid-merge to ask permission for every conflict, this gives it a clear decision framework and keeps things moving.