Prophesee × Mergify
How Mergify optimized Prophesee's development process while lightening the developers' mental load.
To better understand what is a Merge Queue and its usefulness, let's imagine a GitHub repository in the following situation: a pull request is created, it passes the CI, and it is approved by reviewers. All the checks are green, just like the merge button.
1️⃣ Between the moment when all the checks are green and when you press the merge button, another one has just been merged and a new commit appears on the main. Not aware of that, you still see your PR as valid so you slap the merge button.
2️⃣ Boom, Code Conflict: you just broke the main branch! The outdated pull request you just merged introduces regression or breakages in the production system.
😭 Tons of engineers are confronted with this problem every day.
🦾 Using a merge queue solves that problem by updating any pull request that is not up-to-date with its base branch - thanks to an automatic rebase - before it is merged. The update forces the CI to retest the pull request with the new code from its base branch, catching any potential regression.
Click on the cards to learn more and read the related documentation.
Test different PRs in parallel so they can be merged faster.
Batch and test multiple PRs at once. Save CI time.
Freeze your merge queues to provide maximum control and flexibility.
Use multiple queues to manage your PRs merge methods and priorities.
Choose which PR should be merged first, depending on labels, owners, etc.
Click on the cards to learn more and read the related documentation.
Stop wasting CI time and struggling with latency. Define an intelligent, automated testing strategy with our Merge Queue.
Discover how our merge queue can automate and streamline your dependencies updates with Dependabot.
Why test and merge one pull request at a time?
Find out how Mergify's Batches feature lets you ship faster than ever.
Stop wasting CI time and money while dealing with CI latency. Define a smart and automated testing strategy with our Merge Queue. Trigger and run the right tests at the right timing.s
Tired of chasing your reviewers? With Mergify's Merge Queue and Workflow Automation, you can automate and optimize your review requests via automation.
Now that you've understood the basic concept of a merge queue let's get down to the nitty-gritty with a few demos.
Mergify is a GitHub Application that you can install in one click on your repositories. Fabien will present you our Merge Queue solution thanks to a screen recording of the tool.
In this video, Fabien will make a demo of the Batches feature. Using the Batch feature, Mergify can check the mergeability of several pull requests simultaneously.
You can also watch the feature presentation video available on our channel.
In this video, Fabien will make a demo of the Spec Checks feature. Speculative checks put the first PRs from the queue in a merge train and test them together in parallel so they can be merged faster.
You can also watch the feature presentation video available on our channel.
Only three steps to set up your merge queue, automate, and optimize your code merging processes.
Mergify is a GitHub Application that you can install in one click on your repositories.
Write your rules in YAML. You can match a pull request on any criteria: branch, author, labels, etc. Then uses the queue action to trigger a git merge as soon as the pull request is ready, setting the priority of the pull request.
Mergify updates the pull request status in real-time and informs you about which criteria match. As soon as your conditions are validated, Mergify merges the pull request using the method you specified.
To understand how you can use and benefit from our Merge Queue, what better way than to let our users have their say.