chore: pre-resolve server.ts conflict for #22112 (minimal)#22686
Closed
AztecBot wants to merge 2 commits into
Closed
chore: pre-resolve server.ts conflict for #22112 (minimal)#22686AztecBot wants to merge 2 commits into
AztecBot wants to merge 2 commits into
Conversation
AztecBot
added
ci-draft
Collaborator
Author
Flakey Tests🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
…e-train/spartan Pre-resolves the only file conflict (yarn-project/aztec-node/src/aztec-node/server.ts) between danielntmd/safer-failure-path and merge-train/spartan, by porting spartan's in-body edits (feeProvider construction, removed redundant p2pClient.start(), and the 16th feeProvider arg to AztecNodeService) into the safer-failure-path try/catch + tryStop restructure. This replaces the previous full merge-train/spartan→safer-failure-path merge (which brought in 300 commits / 2394 files of auto-mergeable content) with a single, reviewable conflict-resolution commit.
AztecBot
changed the title
AztecBot
force-pushed
the
claudebox/resolve-conflicts-22112
branch
from
806bcdf to
c123fb3
Compare
AztecBot
force-pushed
the
danielntmd/safer-failure-path
branch
from
3fcab8e to
6f29b0c
Compare
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.
Superseded — the conflict resolution was applied directly to
danielntmd/safer-failure-pathas commit6f29b0c9e8(rebased onto currentmerge-train/spartanwith theserver.tsconflict resolved). See #22112 — it now auto-merges cleanly.