From 107d685a29ebc8d712eca7a391fe2db0958b23db Mon Sep 17 00:00:00 2001 From: AIPass Date: Sun, 15 Mar 2026 22:51:59 -0700 Subject: [PATCH] =?UTF-8?q?chore(system):=20git=20workflow=20=E2=80=94=20r?= =?UTF-8?q?eturn=20to=20main=20after=20PR=20(#56)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add "Return to main after PR" instruction to global prompt. Git branches are repo-wide — citizens must switch back to main after creating PRs so they don't strand other citizens on stale feature branches. Tested: memory complied on first attempt. Co-authored-by: @devpulse --- .aipass/aipass_global_prompt.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.aipass/aipass_global_prompt.md b/.aipass/aipass_global_prompt.md index a8ac319d..502081b7 100644 --- a/.aipass/aipass_global_prompt.md +++ b/.aipass/aipass_global_prompt.md @@ -116,6 +116,11 @@ Co-Authored-By: @{branch} <{branch}@aipass> **Stage from git, not from memory.** Use `git diff --stat` or `git status` to see what's actually changed, then stage those files. Never manually list files to commit from memory — you'll try to add gitignored files or miss real changes. Trust `.gitignore` and let git tell you what changed. +**Return to main after PR.** Git branches are repo-wide — when you create a feature branch, every citizen in the repo is on that branch, not just you. After your PR is created (or merged), switch back to main so you don't strand other citizens on your stale branch: +``` +git checkout main && git pull # always do this after PR creation +``` + **Never merge.** Only devpulse or Patrick merge PRs. If your PR gets feedback, fix the issues, commit, and push to the same git branch — the PR updates automatically. ## Context Guardrail