chore(release): record the main merge in dev history (fixes #1787 conflicts)#1788
Merged
Conversation
workflow_dispatch only registers workflows that exist on the default branch, so land the three heavy-suite workflows (Test Cluster, Integration Tests CI, TS Integration Tests) here to make them dispatchable against any branch. Mirrors commit 6a7c236 on feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors the fix on feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors the fix on feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors the fix on feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors the change on feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors the fix on feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…s CI Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Mirrors feat/off-chain-metadata-v2. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
# Conflicts: # .github/workflows/integration-tests-ci.yaml # .github/workflows/test-cluster.yaml # .github/workflows/ts-integration-tests.yaml # .github/workflows/upgrade-test.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#1786 was squash-merged, which applied main's content to dev but discarded the merge ancestry — so git still considers the four workflow files both-sides-modified and the release PR #1787 remains CONFLICTING.
This PR is a pure bookkeeping merge: its tree is byte-identical to current dev (
git diff origin/devis empty); it only recordsorigin/mainas an ancestor.🤖 Generated with Claude Code