Skip to content

Reapply YAML deep-merge fix on v5#2527

Merged
findolor merged 1 commit intov5-reset-basefrom
2026-03-27-deep-merge
Apr 3, 2026
Merged

Reapply YAML deep-merge fix on v5#2527
findolor merged 1 commit intov5-reset-basefrom
2026-03-27-deep-merge

Conversation

@Siddharth2207
Copy link
Copy Markdown
Contributor

Summary

Changes

  • crates/settings/src/yaml/emitter.rs: adds deep_merge_hash helper and updates emit_documents to use it; adds regression test

Test plan

  • Existing emitter tests pass
  • New test_emit_deep_merges_hash_sections test passes
  • CI passes

🤖 Generated with Claude Code

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Mar 27, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: 70edb221-6f91-459a-ae80-cc934ed12774

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch 2026-03-27-deep-merge

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@Siddharth2207 Siddharth2207 changed the base branch from 2026-03-17-v5-revert to v5-reset-base April 1, 2026 15:17
@Siddharth2207 Siddharth2207 requested a review from findolor April 1, 2026 15:28
…YAML

Previously, when merging multiple YAML documents, entries under the same
top-level section (e.g., two different deployers under `deployers:`) would
be lost because the shallow merge simply replaced the entire hash. This
implements deep recursive merging so that different entries under the same
section are properly combined.
@Siddharth2207 Siddharth2207 force-pushed the 2026-03-27-deep-merge branch from 9252f04 to 0d5f85e Compare April 3, 2026 04:03
@findolor findolor merged commit 93872c3 into v5-reset-base Apr 3, 2026
19 checks passed
@findolor findolor deleted the 2026-03-27-deep-merge branch April 3, 2026 06:44
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2026

@coderabbitai assess this PR size classification for the totality of the PR with the following criterias and report it in your comment:

S/M/L PR Classification Guidelines:

This guide helps classify merged pull requests by effort and complexity rather than just line count. The goal is to assess the difficulty and scope of changes after they have been completed.

Small (S)

Characteristics:

  • Simple bug fixes, typos, or minor refactoring
  • Single-purpose changes affecting 1-2 files
  • Documentation updates
  • Configuration tweaks
  • Changes that require minimal context to review

Review Effort: Would have taken 5-10 minutes

Examples:

  • Fix typo in variable name
  • Update README with new instructions
  • Adjust configuration values
  • Simple one-line bug fixes
  • Import statement cleanup

Medium (M)

Characteristics:

  • Feature additions or enhancements
  • Refactoring that touches multiple files but maintains existing behavior
  • Breaking changes with backward compatibility
  • Changes requiring some domain knowledge to review

Review Effort: Would have taken 15-30 minutes

Examples:

  • Add new feature or component
  • Refactor common utility functions
  • Update dependencies with minor breaking changes
  • Add new component with tests
  • Performance optimizations
  • More complex bug fixes

Large (L)

Characteristics:

  • Major feature implementations
  • Breaking changes or API redesigns
  • Complex refactoring across multiple modules
  • New architectural patterns or significant design changes
  • Changes requiring deep context and multiple review rounds

Review Effort: Would have taken 45+ minutes

Examples:

  • Complete new feature with frontend/backend changes
  • Protocol upgrades or breaking changes
  • Major architectural refactoring
  • Framework or technology upgrades

Additional Factors to Consider

When deciding between sizes, also consider:

  • Test coverage impact: More comprehensive test changes lean toward larger classification
  • Risk level: Changes to critical systems bump up a size category
  • Team familiarity: Novel patterns or technologies increase complexity

Notes:

  • the assessment must be for the totality of the PR, that means comparing the base branch to the last commit of the PR
  • the assessment output must be exactly one of: S, M or L (single-line comment) in format of: SIZE={S/M/L}
  • do not include any additional text, only the size classification
  • your assessment comment must not include tips or additional sections
  • do NOT tag me or anyone else on your comment

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.

2 participants