Commit, lint, merge to main, and push — full deploy pipeline from current branch
Deploy the current branch to main. Follow these steps in order, stopping if any step fails:
git status -u (never use -uall) and git diff to see changes.Co-Authored-By: Claude Opus 4.6 <[email protected]>), then push.git pull origin main --no-rebase
If there are merge conflicts, stop and ask the user for help.
Determine which apps have changed files in the branch (compare against main using ).
git diff --name-only main...HEADFor each changed app, run prettier on all .ts and .tsx files in that app's src/ directory (not just the changed files — this avoids missed files from merges):
apps/web: cd apps/web && yarn prettier --write 'src/**/*.{js,jsx,ts,tsx}'apps/api: cd apps/api && yarn prettier --write 'src/**/*.ts'If prettier made changes, commit and push them.
Then run yarn build in each changed app to catch TypeScript compilation errors (unused imports, type mismatches, etc.). If the build fails, fix the errors, commit, and push before proceeding.
git checkout main — if main is used by another worktree, tell the user to detach it and stop.git pull origin main --no-rebasegit merge --squash <branch>Co-Authored-By: Claude Opus 4.6 <[email protected]>). Do not delete the branch — keep it for commit history.git push origin main
git checkout <branch>
Tell the user the deploy is done.