We just launched Mergify – stop merging your GitHub PR manually
Hi fellow hackers,
We've just made available our brand new application named Mergify:
Mergify is a service that allows you to define rules on how to merge your GitHub pull requests: once the rules are matched, the PR is merged. No need to click that green button anymore.
The service is only available for open source public repositories for now, and we'd be eager to get some feedback on it before we open it for private repositories.
I also want to thank this community for its great inspiration, as I have to admit that reading posts around here gave me great motivation when starting this. So thank you all!
Feel free to ask questions – we'd be glad to feedback on any point or side of the app. :)
Awesome idea! Can't wait to see how the project grows!
Hi,
Congrats on shipping this.
I just tried it on one of my repos. Here are a few issues that I noticed.
Will definetely try this again.
We've just added a modal with the link to the documentation so you're guided to create the .mergify.yml file. That was a good and simple idea and improvement, thanks Gaurav!
I want to use this! Are you able to deal with different merging strategies? Some people use normal merges, some do squashing and some do rebasing.
To be very clear: I'd pay $ for a solution that helps my (tiny) team be consistent about our merging practices.
Thanks for the feedback Yves!
Right now the default is
rebase, andmergeis being used if it fails. This is not configurable, but it should not be too hard to do, so I've just opened an issue and we'll look into that ASAP.https://github.com/Mergifyio/mergify-engine/issues/22
@nictuku We've implemented this for what it's worth and you can now pick your merge strategy on a per repository basis: https://doc.mergify.io/configuration.html#merge-strategy
Now I understand more about the different types of merging, I think this is a great service. However, there is one tiny thing that bothers me, and that's GitHub can easily replicate your features by tweaking the merge button. On their side it's just a matter of linking up a few more commands.
GitHub already offers different types of merge on their merge button.
What Mergify offers is the automatic pressing of this button based on criteria and rules you define.
What are the benefits behind squashing and rebasing? I always thought rebasing should be used very carefully.
Squashing makes the history and the PR easier to read because you don't have a bunch of tiny commits with people changing things back and forth, like fixing markdown syntax etc.
Much like Zeke says, rebase goes a step further and removes weird merge commits from the history. So when you merge your huge PR, it looks like a nice linear set of changes on top of the master branch.
The downside of squashing is you lose some history. Say, if you care about how many commits you or your project has, it's gonna mess up with that.
The downside of that rebasing is it's extra work and it's not really 100% supported by GitHub's UI. This creates a lot of confusion for teams. OP's product could help with that.
I prefer rebasing because it keeps the commit history clean, e.g. no "Merge pull request #1 from foo/bar" noise.
Thanks guys. Got it.
This comment was deleted 8 years ago