Skip to content

Keep staging current with master - #50

Merged
daveosterjr merged 3 commits into
stagingfrom
codex/sync-master-cli
Oct 27, 2026
Merged

daveosterjr merged 3 commits into
stagingfrom
codex/sync-master-cli

Conversation

@dealmachine-alma

Copy link
Copy Markdown
Contributor

Factory's staging catch-up: master has 2 commits staging does not, such as a hotfix or a release merge. This merges master 7c12c9e into staging, keeping everything staging already has.

It goes through staging's merge queue and required checks like any change. A conflict or failed check waits for a person; see https://factory.dealmachine.com/guides/guides-hotfixes.

daveosterjr and others added 3 commits October 27, 2026 12:03
The automatic release checked a second time, right before npm publish,
that master still pointed at its source, and failed if another merge had
landed during the build and checks. The workflow already runs the whole
release in one concurrency group that never cancels a run in progress,
so the newer merge waits and publishes next. Keep the check at the start,
which still refuses a rerun of an older commit, and drop only the later
comparison. Every other identity, registry and integrity check still runs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Let a started npm release finish after newer merges (WORK-9253)
@daveosterjr
daveosterjr added this pull request to the merge queue Oct 27, 2026
Merged via the queue into staging with commit 7ca2f8b Oct 27, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant