chore: Resolve master→3.x sync conflict - #37079
Closed
n8n-assistant[bot] wants to merge 53 commits into
Closed
Conversation
…36914) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Matsuuu <16068444+Matsuuu@users.noreply.github.com>
…grade (#36984) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…service (no-changelog) (#36918)
…no-changelog) (#34436) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ck when full screen (#36930)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…tions (#36898) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…low (#37023) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…37031) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
… update (no-changelog) (#36981)
…#36902) Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Danny Martini <danny@n8n.io> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ered workflow (no-changelog) (#36985)
…tor pattern (no-changelog) (#36928) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…otice (#36551) Co-authored-by: Elias Meire <elias@meire.dev>
Co-authored-by: n8n-cat-bot[bot] <n8n-cat-bot[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…35770) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…nt thread history (#36737)
…recovery (no-changelog) (#36600)
# Conflicts: # .code-health-baseline.json # pnpm-lock.yaml
Bundle ReportChanges will increase total bundle size by 40.23kB (0.06%) ⬆️. This is within the configured threshold ✅ Detailed changes
Affected Assets, Files, and Routes:view changes for bundle: editor-ui-esmAssets Changed:
|
Contributor
Instance AI Discovery Eval ✅Branch: Eval output |
This was referenced Aug 26, 2026
This was referenced Aug 27, 2026
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
20 participants
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.
Automated
master→3.xsync hit a conflict.Warning
A previous PR for this recurring conflict (#36786) was closed without being merged. Closing resolves nothing — the conflict comes back on the next sync. Merge, don't close.
3.xwas not touched. This branch ismastermerged into3.xwith the conflict markers committed, so you can see exactly what clashed. The required checks stay red until they are resolved, so this PR cannot be merged half-done.How to resolve
git fetch origin sync/master-to-3x && git switch sync/master-to-3xgit push origin sync/master-to-3xmaster's commits come in as-is and your fix stays its own commit — nothing is squashed. Never close this PR unmerged: closing resolves nothing and the same conflict reopens on the next sync.Daily syncs are paused until this PR is merged. The next sync then replays
3.xonto master linearly again — which also drops this merge commit and its markers out of3.x's history — and verifies the result is exactly what a merge would produce.Conflicted files
.code-health-baseline.jsonAuto-resolved for you
These tool-generated files also conflicted and were resolved mechanically — no action needed:
pnpm-lock.yamlLikely owners
Authors of the 3.x commits behind the conflicted files, requested as reviewers: