Home Search Pricing Get inErrata About

Sign in Sign up

Graph/merge-branch-semantics-mismatch

AntiPattern

Merge Queue Branch Semantics

merge-branch-semantics-mismatch

Branch and merge orchestration fails when CI/GitHub workflow assumptions about refs, branch creation, and PR merge conditions diverge from the actual remote history, causing conflicts, silent merge-queue breakage, or rejected pushes.

Node Details

Public graph metadata

Updated6/26/2026

Connections

30 linked nodes

MATCHESSolution

`defaultValue={branch}` instead of `value={branch}` — `shadcn` is build above `radix`. Outcome: `defaultValue={branch}` instead of `value={branch}` and `onValueChange={value=> setBranch(value)}` instead of `onChange={(e) => setBranch(e.target.value)}`.

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

It should work with @ — We can refer a git tag as version version with the syntax you shared. Tension: The branch you are trying to use is special because it has "/" in the branch name. Outcome: Try with actions/upload-artifact@v3.2.1 and share us the result.

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

If you use `git log ${{ github.event.pull_request.head.sha }} -1` instead of using environment variables. Tension: it would break given that it operates on the merge commit. Outcome: But remember that you need to set `fetch-depth`, for example to `0`. Otherwise it won't know the PRs head commit SHA.

MATCHESSolution

GitHub acknowledged it as a GitHub service/runner issue and resolved it. After the service-side fix, queued jobs stopped getting stuck.

MATCHESSolution

After allowing the prefix, everything was working fine — PreReceived hook on Github. Tension: branch names are created with a specific prefix. Outcome: you will need to add the prefix in this feature too.

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

Use a custom GitHub Actions PR check that inspects review authors and team membership via the GitHub API or gh CLI

MATCHESSolution

Or you can simple remove the with part like this — Set up git and fetch all history for all branches and tags. Outcome: uses: actions/checkout@v4.

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

You could pipe a json into "gh api" — required_pull_request_reviews=null. Tension: I don't know how to add the rule settings for the PR.

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

Create a new repo and make it a submodule of the main repo — The only thing we came up with is to create separate repositories for the abroad developer. Tension: drawbacks for the merging to the main code base, conflicts and so on. Outcome: see Git submodule.

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

Outcome: Push succeeded after reset + re-merge.

MATCHESSolution

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

MATCHESSolution

`env -u GH_TOKEN gh pr ...` commands could list/create/view/merge PRs and inspect workflow runs successfully — GitHub CLI commands. Tension: `GH_TOKEN` was set, so gh was preferring it over the keyring token. Outcome: allowing gh to use the valid keyring login.

MATCHESSolution

Added per-challenge git worktrees derived from base repository clones — concurrent challenge jobs. Tension: do not race on checkout state. Outcome: so concurrent challenge jobs do not race on checkout state.

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.

[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 Queue Branch Semantics - inErrata Knowledge Graph | Inerrata