merge-upstream-main
Skill54 starsChanged 3 months agoApache-2.0View on GitHub
Merge the public openai/codex-security main branch into this fork's main branch and push the result to the fork remote. Use when asked to sync or merge upstream main for this repository.
- Commits and pushes
In this repository8 other files it gives its agents.
- AGENTS.mdAGENTS.md
- .pm/AGENTS.mdAGENTS.md
- .pm/CLAUDE.mdCLAUDE.md
- loop-workerSkill
- pm-brainstormSkill
- pmSkill
- releaseSkill
- shipSkill
The file
We split this skill into the rules it gives an agent
7 rules. About 0 are common, 5 are distinctive, and 2 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈5
Distinctive · estimate
This author's own choices. Worth a look.
2
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- could be automatic: a setting could enforce it
- Distinctive: line 17
Do not switch branches, stash changes, or discard work automatically.
- Distinctive: line 19
Read the applicable AGENTS.md instructions before resolving conflicts or running checks.
- Distinctive: line 32
Never select the canonical repository as the fork remote.
- Very specific: line 40
Use task-specific upstream_remote and fork_remote shell variables for the selected remote names, and quote their expansions in commands.
- Very specific: line 53
If conflicts occur, inspect each one and reconcile the fork's behavior with the upstream change.
- Distinctive: line 56
Run the repository checks relevant to the merged or conflict-resolved files.
- Distinctive: line 65
Never force-push, rebase main, skip hooks, or discard changes.
≈ “Common” is an estimate: at least 1 in 5 of the 364,980 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Merge Upstream Main
Sync this fork from https://github.com/openai/codex-security.git with a Git
merge. Do not rebase or rewrite main.
Inspect The Repository
- Confirm the current repository, branch, worktree, and remotes with
git rev-parse --show-toplevel,git branch --show-current,git status --short --branch, andgit remote -v. - Continue only on
mainwith a clean worktree, including no untracked files. Do not switch branches, stash changes, or discard work automatically. Report the state and ask the user how to proceed when either condition is not met. - Read the applicable
AGENTS.mdinstructions before resolving conflicts or running checks.
Identify The Remotes
- The canonical upstream is the remote whose normalized GitHub repository is
openai/codex-security. Reuse an existing matching remote. If none exists, add it asupstreamwith the canonical URL above when that remote name is available. Ifupstreamalready points elsewhere, stop and ask rather than rewriting it. - The fork remote is the remote tracked by local
main, when that remote is not the canonical repository; otherwise prefer a noncanonicalorigin, then the sole remaining noncanonical remote. - Never select the canonical repository as the fork remote. If no fork remote exists, or multiple candidates make the destination ambiguous, stop and ask the user to identify or configure the fork remote. Do not guess a repository URL or rewrite an existing remote.
Show the selected upstream and fork remote names and URLs before fetching. This guards against pushing the fork merge to the canonical repository.
Use task-specific upstream_remote and fork_remote shell variables for the
selected remote names, and quote their expansions in commands.
Merge And Verify
- Fetch both selected remotes with
git fetch "$upstream_remote"andgit fetch "$fork_remote". - Fast-forward local
mainto the fork's remote-trackingmainwithgit merge --ff-only "$fork_remote/main". If local and forkmainhave diverged, stop and report the commits on each side instead of choosing a history strategy. - Merge upstream with
git merge --no-edit "$upstream_remote/main". A fast-forward is acceptable when the fork has no unique commits. - If conflicts occur, inspect each one and reconcile the fork's behavior with
the upstream change. Do not resolve all conflicts with a blanket
oursortheirsstrategy. Continue the merge only after the result is coherent. - Run the repository checks relevant to the merged or conflict-resolved files. A clean, conflict-free upstream merge does not require inventing new tests.
- Push local
mainwithgit push "$fork_remote" main:mainwithout force. - Fetch both remotes again, then verify:
git merge-base --is-ancestor "$upstream_remote/main" mainsucceeds.git rev-list --left-right --count "$fork_remote/main...main"reports0 0.git status --short --branchis clean.
Never force-push, rebase main, skip hooks, or discard changes. If a command
fails, diagnose it and continue only when doing so preserves both upstream and
fork history.
Report the selected remotes, whether the update fast-forwarded or created a merge commit, the resulting commit, checks run, push result, and final verification.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

