From 981ff1c7f89b27ff3d7c2957e211365baff0a359 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 1 Oct 2026 06:50:22 -0700 Subject: AGENTS.md: keep master and prod in sync. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VP5Ljqk7EYcm5QQAbzDwog --- AGENTS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AGENTS.md b/AGENTS.md index 7d500e6..6519e54 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -3,3 +3,4 @@ - After completing and validating a requested change in this project, deploy it to production automatically. Do not stop at a local implementation or ask for deployment confirmation unless the user explicitly requests otherwise. This is the user's standing instruction from 2026-09-28. - Deploy only the requested changes; preserve unrelated work in the shared workspace. Use an isolated release worktree when necessary. - Production deploys through `git push prod HEAD:prod` (`prod` points to `cs:coinosv3.git`). The remote post-receive hook builds and publishes the site at https://v3.coinos.io. Verify the live assets and matching service-worker version after deployment. +- Keep `master` and `prod` identical (user's instruction, 2026-10-01). Build release worktrees from `master` (after `git fetch prod` and checking `prod/prod` is not ahead). After the prod push succeeds, fast-forward `master` to the deployed commit and push it to `origin`: `git push prod HEAD:prod && git push origin HEAD:master`. If the shared checkout has uncommitted work on `master`, move the ref with `git update-ref` and carry the working-tree edits over with a three-way merge per file (`git merge-file`); never stash or reset them away. -- cgit v1.2.3