Skip to content

Commit c980ef0

Browse files
jun0claude
andcommitted
[rustjava-upstream-sync-s5-java12-api-fix2] docs(agents): 브랜치는 origin/main 에서 자른다 · PR 오픈 직후 mergeable 조회 (게이트² F1-⑶)
날짜·근거 병기. 기존 MANDATORY 「sync local main」과의 관계 1줄 명시(대체가 아니라 그것이 깨져도 안전한 형태). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1 parent a4df71a commit c980ef0

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

‎AGENTS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
## Git Workflow
1919
- **Never commit directly to `main`**: always work on a short-lived branch.
2020
- **Clean up merged branches (MANDATORY)**: once a branch's work is complete and merged into `main`, delete it — remote and local — and sync local `main`. Prefer `gh pr merge --delete-branch` (deletes the remote), then locally `git branch -D <branch>` and `git fetch --prune`. Use `-D` (force) because squash-merged branches aren't recognized as merged by `-d`. Leave no stale merged branches behind — only `main` and in-progress work remain. Never re-merge or re-PR an already-merged branch.
21+
- **Cut the branch from `origin/main`, never from local `main`** (2026-09-11): `git fetch origin && git checkout -b <branch> origin/main`. This does *not* replace the "sync local `main`" duty above — it makes forgetting it harmless, which is the point. `git fetch origin` refreshes `origin/main` but leaves local `main` where it was, so branching off `main` silently inherits however stale it is. Basis: PR #35 was cut from a local `main` two days behind and opened `CONFLICTING`.
22+
- **Query `mergeable` right after opening a PR** (2026-09-11): `gh pr view <N> -R Jun025/RustJava --json mergeable`, and re-query after a few seconds — the first call often returns `UNKNOWN` because GitHub computes it lazily. Record the value in the round's reply. Basis: same incident — the conflict went unreported for a whole round because nothing in the round ever measured this axis.
2123

2224
## Project Structure
2325
- `jvm/` - Core JVM implementation (`#![no_std]`)

0 commit comments

Comments
 (0)