⚠️ The pull request has been merged by @cyndichin

Rule: Resolve conflict (comment)

• conflict

Rule: Rust Component Upgrade - Auto Merge (queue)

• files=Client.xcodeproj/project.pbxproj
• files=Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
• -draft [📌 queue requirement]
• author=github-actions[bot]
• check-success=Bitrise
• any of: [📌 queue -> configuration change requirements]
  • -mergify-configuration-changed
  • check-success=Configuration changed
• any of: [🔀 queue conditions]
  • all of: [📌 queue conditions of queue default]
    • #approved-reviews-by>=1 [🛡 GitHub branch protection]
    • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
    • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
    • any of: [🛡 GitHub branch protection]
      • check-success=Bitrise
      • check-neutral=Bitrise
      • check-skipped=Bitrise

Rule: Rust Component Upgrade - Auto Merge (review)

• files=Client.xcodeproj/project.pbxproj
• files=Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
• author=github-actions[bot]
• check-success=Bitrise

Rule: L10N - Auto Merge (queue)

• -files~=^(?!^.+\.strings).+$
• -draft [📌 queue requirement]
• author=github-actions[bot]
• check-success=Bitrise
• files~=^.+\.strings$
• any of: [📌 queue -> configuration change requirements]
  • -mergify-configuration-changed
  • check-success=Configuration changed
• any of: [🔀 queue conditions]
  • all of: [📌 queue conditions of queue default]
    • #approved-reviews-by>=1 [🛡 GitHub branch protection]
    • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
    • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
    • any of: [🛡 GitHub branch protection]
      • check-success=Bitrise
      • check-neutral=Bitrise
      • check-skipped=Bitrise

Rule: L10N - Auto Merge (review)

• -files~=^(?!^.+\.strings).+$
• author=github-actions[bot]
• check-success=Bitrise
• files~=^.+\.strings$

Rule: Needs landing - Rebase (queue)

• label=Needs Landing
• #approved-reviews-by>=1
• -draft
• -draft [📌 queue requirement]
• check-success=Bitrise
• label!=Do Not Merge ⛔️
• any of: [📌 queue -> configuration change requirements]
  • -mergify-configuration-changed
  • check-success=Configuration changed
• any of: [🔀 queue conditions]
  • all of: [📌 queue conditions of queue default]
    • #approved-reviews-by>=1 [🛡 GitHub branch protection]
    • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
    • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
    • any of: [🛡 GitHub branch protection]
      • check-success=Bitrise
      • check-neutral=Bitrise
      • check-skipped=Bitrise

Rule: Needs landing - Squash (queue)

• label=Needs Landing (Squash)
• #approved-reviews-by>=1
• -draft
• -draft [📌 queue requirement]
• check-success=Bitrise
• label!=Do Not Merge ⛔️
• any of: [📌 queue -> configuration change requirements]
  • -mergify-configuration-changed
  • check-success=Configuration changed
• any of: [🔀 queue conditions]
  • all of: [📌 queue conditions of queue default]
    • #approved-reviews-by>=1 [🛡 GitHub branch protection]
    • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
    • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
    • any of: [🛡 GitHub branch protection]
      • check-success=Bitrise
      • check-neutral=Bitrise
      • check-skipped=Bitrise

---

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!

---

2 not applicable rules

Rule: Bitrise update - Auto Merge (queue)

• -files~=^(?!bitrise.yml).+$
• files=bitrise.yml
• head=update-br-new-xcode-version
• -draft [📌 queue requirement]
• author=github-actions[bot]
• check-success=Bitrise
• any of: [📌 queue -> configuration change requirements]
  • -mergify-configuration-changed
  • check-success=Configuration changed
• any of: [🔀 queue conditions]
  • all of: [📌 queue conditions of queue default]
    • #approved-reviews-by>=1 [🛡 GitHub branch protection]
    • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
    • branch-protection-review-decision=APPROVED [🛡 GitHub branch protection]
    • any of: [🛡 GitHub branch protection]
      • check-success=Bitrise
      • check-neutral=Bitrise
      • check-skipped=Bitrise

Rule: Bitrise update - Auto Merge (review)

• -files~=^(?!bitrise.yml).+$
• files=bitrise.yml
• head=update-br-new-xcode-version
• author=github-actions[bot]
• check-success=Bitrise

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com