Skip to content

feat(merge-driver): resolve JSON conflicts structurally - #1869

Closed
jd wants to merge 1 commit into
mainfrom
devs/jd/jd/mrgfy-9993-json-merge-driver-in-rust/resolve-json-conflicts-structurally--4919b525
Closed

jd wants to merge 1 commit into
mainfrom
devs/jd/jd/mrgfy-9993-json-merge-driver-in-rust/resolve-json-conflicts-structurally--4919b525

feat(merge-driver): resolve JSON conflicts structurally

bfc465e
Select commit
Loading
Failed to load commit list.
Mergify / Mergify Merge Queue completed Oct 1, 2026 in 0s

Waiting for queue conditions to match

Queue entry conditions

  • -draft [📌 queue requirement]
  • deployment-success = @mergify/Mergify Merge Protections [📌 queue requirement]
  • any of [🔀 queue conditions]:
    • all of [📌 queue conditions of queue rule default]:
      • all of [🛡 Merge Protections rule 👀 Review Requirements]:
        • any of:
          • #approved-reviews-by>=2
          • author = dependabot[bot]
          • author = mergify-ci-bot
          • author = renovate[bot]
      • all of [🛡 Merge Protections rule 🔎 Reviews]:
        • #review-requested = 0
        • #review-threads-unresolved = 0
        • #changes-requested-reviews-by = 0
      • base=main
      • github-review-approved [🛡 GitHub branch protection]
      • github-review-approved [🛡 GitHub repository ruleset rule Require pull request for default branch]
      • label!=manual merge
      • all of [🛡 Merge Protections rule Enforce conventional commit]:
        • title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:
      • all of [🛡 Merge Protections rule 📕 PR description]:
        • body ~= (?ms:.{48,})
      • all of [🛡 Merge Protections rule 🤖 Continuous Integration]:
        • all of:
          • check-success=ci-gate
    • all of [📌 queue conditions of queue rule dependencies]:
      • all of [🛡 Merge Protections rule 👀 Review Requirements]:
        • any of:
          • #approved-reviews-by>=2
          • author = dependabot[bot]
          • author = mergify-ci-bot
          • author = renovate[bot]
      • all of [🛡 Merge Protections rule 🔎 Reviews]:
        • #review-requested = 0
        • #review-threads-unresolved = 0
        • #changes-requested-reviews-by = 0
      • any of:
        • author = dependabot[bot]
        • author = renovate[bot]
      • base=main
      • github-review-approved [🛡 GitHub branch protection]
      • github-review-approved [🛡 GitHub repository ruleset rule Require pull request for default branch]
      • label!=manual merge
      • all of [🛡 Merge Protections rule Enforce conventional commit]:
        • title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:
      • all of [🛡 Merge Protections rule 📕 PR description]:
        • body ~= (?ms:.{48,})
      • all of [🛡 Merge Protections rule 🤖 Continuous Integration]:
        • all of:
          • check-success=ci-gate
  • -closed [📌 queue requirement]
  • -conflict [📌 queue requirement]
  • any of [📌 queue -> configuration change requirements]:
    • -mergify-configuration-changed
    • check-success = @mergify/Configuration changed
    • check-success = @mergify/Configuration has been deleted

All conditions must match for automatic queuing. You can also use @Mergifyio queue to queue manually.