bex-co/bex-security / .claude/skills/merge-upstream-main
merge-upstream-main
VerifiedMerge 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.
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.
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| rea-analysis-optimizationmorluto/reaOptimize REA providers and shared analysis workflows for agent context, latency, CPU, and memory while preserving correctness and Evidence. Use for analysis bottlenecks and cache or query design; CI/test-suite optimization belongs to rea-ci-tests-audit. | Stars: 469k | Updated | Claude CodeCodex | Verified | Install |
| rea-ci-tests-auditmorluto/reaAudit REA CI and test suites for correctness, fixture drift, false passes, and measured performance; use for suite or workflow investigations and efficiency changes, rather than ordinary feature testing or a single test failure. | Stars: 469k | Updated | Claude CodeCodex | Verified | Install |
| rea-tool-designmorluto/reaAudit, investigate, design, or change REA investigation tools, CLI/MCP contracts, provider capabilities, and Evidence semantics. | Stars: 469k | Updated | Claude CodeCodex | Verified | Install |
| ponytail-auditDietrichGebert/ponytailQuality audit of the whole repo: bugs, security, real load, missing tests, speed, and what to delete. Most important first. | Stars: 194k | Updated | Claude CodeCodex | Verified | Install |