Skip to content

emrg: evolution_prompt Step 5 branch-collision guard (R743 lesson)#673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argszero merged 1 commit into from
Aug 11, 2026
Merged

emrg: evolution_prompt Step 5 branch-collision guard (R743 lesson) #673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions emrg/server/evolution_prompt.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -492,6 +492,14 @@ cd {{ source_dir }}
git checkout -b feature/<short-description>
git add -A
git commit -m "emrg: <short-description>"
# ⚡ Branch-collision guard (R743 lesson): a parallel instance may already have pushed
# this exact branch name + opened a PR with the same intent. Check BEFORE pushing:
# gh pr list -R {{ owner }}/{{ repo }} --head feature/<short-description> --state all
# If a PR already exists with the same intent: do NOT create a duplicate — review it
# (Step 1.1) and, if your commit adds value, comment on the existing PR instead.
# If the remote branch exists (push rejected non-fast-forward): git fetch origin <branch>
# + diff against your commit; NEVER force-push over an existing remote branch — the
# overwritten commit is often unrecoverable (already pruned from the remote).
git push origin feature/<short-description>
gh pr create -R {{ owner }}/{{ repo }} --title "emrg: <short-description>" --body "brief description of changes and reasons"
```
Expand Down
Loading