Skip to content

Extend git flow complex example to post merge and rebase behaviour #4585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
9swampy wants to merge 5 commits into
base: main
Choose a base branch
from
+682 −54

Add CommitLabelGenerator and additional documentation to tests.

2f23dd0
Select commit
Loading
Failed to load commit list.
Draft

Extend git flow complex example to post merge and rebase behaviour #4585

Add CommitLabelGenerator and additional documentation to tests.
2f23dd0
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded May 26, 2026 in 7s

1 potential rule

Rule: Thank contributor (comment)

  • merged
  • -author~=^dependabot(|-preview)\[bot\]$
💖  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: Automatic merge and approval for Dependabot (queue)

  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • author~=^dependabot(|-preview)\[bot\]$
  • check-success=Build & Test (new-cli)
  • check-success=DotNet Format
  • check-success=Release
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue rule default]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule main branch rule]
      • check-success=Build & Test (new-cli)
      • check-success=DotNet Format
      • check-success=Release
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = DotNet Format
        • check-skipped = DotNet Format
        • check-success = DotNet Format
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Build & Test (new-cli)
        • check-skipped = Build & Test (new-cli)
        • check-success = Build & Test (new-cli)
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Build & Package / macos-26
        • check-skipped = Build & Package / macos-26
        • check-success = Build & Package / macos-26
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Build & Package / windows-2025-vs2026
        • check-skipped = Build & Package / windows-2025-vs2026
        • check-success = Build & Package / windows-2025-vs2026
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / macos-26 - net10.0
        • check-skipped = Test / macos-26 - net10.0
        • check-success = Test / macos-26 - net10.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / macos-26 - net8.0
        • check-skipped = Test / macos-26 - net8.0
        • check-success = Test / macos-26 - net8.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / macos-26 - net9.0
        • check-skipped = Test / macos-26 - net9.0
        • check-success = Test / macos-26 - net9.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / ubuntu-24.04 - net10.0
        • check-skipped = Test / ubuntu-24.04 - net10.0
        • check-success = Test / ubuntu-24.04 - net10.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / ubuntu-24.04 - net8.0
        • check-skipped = Test / ubuntu-24.04 - net8.0
        • check-success = Test / ubuntu-24.04 - net8.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / ubuntu-24.04 - net9.0
        • check-skipped = Test / ubuntu-24.04 - net9.0
        • check-success = Test / ubuntu-24.04 - net9.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / windows-2025-vs2026 - net10.0
        • check-skipped = Test / windows-2025-vs2026 - net10.0
        • check-success = Test / windows-2025-vs2026 - net10.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / windows-2025-vs2026 - net8.0
        • check-skipped = Test / windows-2025-vs2026 - net8.0
        • check-success = Test / windows-2025-vs2026 - net8.0
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Test / windows-2025-vs2026 - net9.0
        • check-skipped = Test / windows-2025-vs2026 - net9.0
        • check-success = Test / windows-2025-vs2026 - net9.0
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule main branch rule]
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-skipped = Release
        • check-neutral = Release
        • check-success = Release
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-success = Build & Package / ubuntu-24.04
        • check-neutral = Build & Package / ubuntu-24.04
        • check-skipped = Build & Package / ubuntu-24.04
      • any of: [🛡 GitHub repository ruleset rule main branch rule]
        • check-neutral = Mergify Merge Protections
        • check-skipped = Mergify Merge Protections
        • check-success = Mergify Merge Protections
  • -closed [📌 queue requirement]
  • repository-full-name=GitTools/GitVersion
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [📌 queue requirement]
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
    • check-success = Mergify Merge Protections

Rule: Automatic merge and approval for Dependabot (review)

  • author~=^dependabot(|-preview)\[bot\]$
  • check-success=Build & Test (new-cli)
  • check-success=DotNet Format
  • check-success=Release
  • repository-full-name=GitTools/GitVersion
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

View more details on Mergify