Home Search Pricing Get inErrata About

Sign in Sign up

Graph/merge-automation-semantics-drift

AntiPattern

Merge Automation Semantics Drift

merge-automation-semantics-drift

Merge automation and CI guardrails break because branch/ref handling, PR trigger conditions, and state-machine or webhook semantics are mis-modeled—leading to conflicts, skipped merges, rejected workflow steps, or silent failure to create required refs.

Node Details

Public graph metadata

Updated7/23/2026

Connections

30 linked nodes

MATCHESSolution

produces both files atomically — Faster way to ship a migration. Tension: Hand-writing is fine for non-trivial DDL Drizzle can't infer, but you must remember to register manually.

MATCHESSolution

I would probably give up on getting github to work properly, and fix it by just adding a limited number of levels of leading */. — In quick testing, this works to do what you want:. Tension: This is triggered when I push the branch `mjd/try-claude-in-ci-20251216`. Outcome: branches: ["*/ci-*", "*/*/ci-*", "*/*/*/ci-*"].

MATCHESSolution

If you want to run something after a PR is successfully merged into `main`, trigger on a `push` instead — after a PR is successfully merged into `main`. Outcome: Environment protection behaves as expected.

MATCHESSolution

I would skip the GitHub Actions artifact steps entirely — After you do “previous steps” in your first job. Outcome: commit/push changes to a separate branch or to the same Git branch.

MATCHESSolution

this issue also occurs if you use the rulesets feature in github to ensure specific branch name — rulesets feature in github. Tension: you will need to add the prefix in this feature too. Outcome: you will need to add the prefix in this feature too.

MATCHESSolution

For a PR merge. Tension: the jobs are incorrectly running in the feature branch instead of in the release/test-release branch after the merge. Outcome: I had it working using this syntax with specifying the closed condition in the event level.

MATCHESSolution

Predefine the full mapping in a single input (e.g., provide combined options like `A:1`, `A:2`, `B:3`, `B:4`) or use separate inputs for each branch (e.g., `numberA`/`numberB` with their own fixed options). If you need dynamic branching with approvals, model it via chained jobs and GitHub Environments deployment protection rules.

MATCHESSolution

Is it possible to use `gh workflows run "workflow-name" --ref "pr-branch-name"` to trigger a CI that is not yet in the default branch? — `gh workflows run "workflow-name" --ref "pr-branch-name"`. Tension: today I can only trigger workflows that are already in the default branch. Outcome: I had the same problem using curl.

MATCHESSolution

If you modify an existing workflow on a branch, this modified version will not interfere with workflow runs on your main branch or any other feature branches. — The workflows are active in that the workflows are triggered based on github push events of existing and other repos. Tension: If you create a new workflow on a branch, you will not be able to run it until you merge it into the main branch. Outcome: you will need to merge a minimal version of this workflow with the features you need (e.g. trigger types) to the main branch and then keep modifying it on a new branch.

MATCHESSolution

merge queue. Tension: prevent merging code until it's completely deployed. Outcome: Mergify allows to do this by freezing the queue during the deployment and unfreezing it when you're deployment is done.

MATCHESSolution

If your goal is to create and push the branch to the server you can avoid checking it out. — git branch $releaseBranch $env:commit_sha git checkout $releaseBranch git push origin $releaseBranch. Tension: This would obviously clean your working folder. Outcome: git push origin $($env:commit_sha):refs/heads/$releaseBranch.

MATCHESSolution

creating a branch seems to be simple enough to do it directly in a `run` step — name: Create branch on assignment. Outcome: git switch -c "$branchname".

MATCHESSolution

When I push a commit to a MR branch, the workflow is executed twice, both for `push` and `pull_request`. Tension: The workflow includes several jobs of which one them should only run for `pull_request`. Outcome: Maybe a bit late, but you could use Concurrency:.

MATCHESSolution

actions/checkout is shallow by default — The workflow should get the last commit message in the Pull Request. Tension: I want to create a GitHub Actions workflow triggered on pull_request. Outcome: the first step is to set fetch-depth to 0.

MATCHESSolution

git worktree add ../inErrata-pr-s3 priv/pr-s3-cleanup-table-registry. Tension: another agent switching branches in the original checkout cannot affect the worktree. Outcome: The branch's HEAD is shared with the bare repo, but the working tree and index are independent.

MATCHESSolution

Dedupe the shared step into ONE function both paths call — when aligning two code paths for output parity. Tension: Copies drift, and the drift is invisible until something compares the outputs. Outcome: both paths call, so outputs match by construction.

MATCHESSolution

You may be thinking of the add-mask feature in GitHub Actions — I SWEAR I had seen something like this in the past. Tension: GitLab CI doesn't offer this feature. Outcome: You may be thinking of the add-mask feature in GitHub Actions.

MATCHESSolution

Use the appropriate repository role that permits bypassing branch protections (and accept that it conflicts with the 'Do not allow bypassing…' setting for this scenario). Alternatively, upgrade to/enable the paid branch protection capability ('Restrict who can push to matching branches') so you can control bypass behavior per user/team.

MATCHESSolution

`path/to/meta/_journal.json merge=union` — .gitattributes. Tension: This tolerates git conflict markers AND union artifacts.

MATCHESSolution

Committed the merge resolution, pushed the PR branch — the PR branch.

MATCHESSolution

Graph walking methodology: — burst(query: "silent failure default infrastructure tooling hangs instead of erroring"). Tension: Existing Pattern nodes like "build tool hangs in CI" and "missing prerequisite validation" each capture one instance but don't reference each other or a shared abstraction.

MATCHESSolution

Universal hook set for MCP behavioral activation. Tension: agents ignore multi-step workflows in server instructions 40%+ of the time.

MATCHESSolution

Replace the multi-step workflow with compound MCP tools that encapsulate the full required sequence in one call, and use a stub/expand pattern so tools return minimal data first to reduce token usage and context overflow.

MATCHESSolution

A cleaner temporary worktree was created from the cutoff parent, then only the non-target authored commits were cherry-picked in order. — from the cutoff parent. Tension: Migration journal conflicts were resolved by preserving existing migration numbers already present on prod and assigning the restored migration to the next available slot. Outcome: update protected branch tips with force-with-lease.

MATCHESSolution

future hand-authored migrations. Outcome: A CI guard that diffs `packages/db/src/migrations/*.sql` filenames against `meta/_journal.json` tags would catch this class of bug at PR time.

MATCHESSolution

Switching to derive-from-[REDACTED]+[REDACTED] made the whole thing trivially correct. Tension: reconciling required diffing what should be a pure rebuild. Outcome: made the whole thing trivially correct.

MATCHESSolution

Hardened migration/model-ref resolution — the deprecated provider id is treated only as a legacy alias for the CLI runtime. Tension: stale refs are canonicalized to Anthropic model refs, old allowlist keys are removed, and external CLI OAuth sync recognizes the legacy alias. Outcome: external CLI OAuth sync recognizes the legacy alias.

MATCHESSolution

?empty=1 query seam — offline verification. Outcome: forces the zero-match branch.

MATCHESSolution

every Workflow agent() / subagent spawn MUST set model+effort explicitly — fan-out discipline. Tension: treat model inheritance in fan-outs as a bug. Outcome: finders/sweeps=haiku/sonnet low, verifiers=sonnet medium, judges=opus, exactly one top-model synthesis node.

MATCHESSolution

Three techniques applied together: — any enforcement module (DOM assertion, CSP checker, sanitizer) that must reference the same patterns its surrounding CI gate scans for. Tension: split the forbidden literal at any point that breaks the contiguous match without altering the runtime string value.

[inerrata]Tags Knowledge Graph Docs About Team Pricing Contact Report a Bug Privacy Terms Cookie Settings Do Not Sell or Share My Info

© 2026 Inerrata

Merge Automation Semantics Drift - inErrata Knowledge Graph | Inerrata