DEV Community

Cover image for Merging Pull Requests Like a Pro With Mergify

Merging Pull Requests Like a Pro With Mergify

Aniket Pal on May 18, 2022

If you have been using Git for sometime now, I am sure working with Pull Requests is now a second nature to you. And it is also possible you have s...
Collapse
 
wintercounter profile image
Victor Vincent

Using a merge queue solves that problem by updating any pull request that is not up-to-date with its base branch before it is merged.

I don't understand how this can solve conflicts.

Collapse
 
adamdicarlo profile image
Adam DiCarlo

Once the branch is updated, presumably the build is run again with the changes (now) applied to the latest code from the main branch. So the test suite (and type checker, linters, etc.) will run against the broken code and thus will at least have the chance to catch the error introduced by the conflict. Without the rebase and extra run of the build, that error would have landed on the main branch.

Collapse
 
aniket762 profile image
Aniket Pal

Thanks a lot for answering :)

Collapse
 
tnir profile image
T "@tnir" N

Interesting! Are you using only short-time tests, not full test like integration tests?

Collapse
 
andrewbaisden profile image
Andrew Baisden

Interesting tool.

Collapse
 
aniket762 profile image
Aniket Pal

Thanks @andrewbaisden 💖

Collapse
 
andrewbaisden profile image
Andrew Baisden

Sure no problem.

Collapse
 
sumana2001 profile image
Sumana Basu

Wow! This is really cool. Never knew about Merge queue and mergify😍

Collapse
 
aniket762 profile image
Aniket Pal

Thanks @sumana2001 💖

Collapse
 
aabhassao profile image
Aabhas Sao

Interesting read 🤩. Got to know about merge queue. Need to dig deep now.

Collapse
 
aniket762 profile image
Aniket Pal

Thanks @aabhassao 💖

Collapse
 
kumarshantanu01 profile image
Kumar Shantanu

Amazing blog.🔥
Got to learn a new thing.✨

Collapse
 
aniket762 profile image
Aniket Pal

Thanks @kumarshantanu01 💖

Collapse
 
kachilero profile image
Alejandro

Any chance that this will be ported over to use on Bitbucket?

Collapse
 
aniket762 profile image
Aniket Pal • Edited

Hey Alejandro, currently we don't have any plans on porting to Bitbucket :(

Collapse
 
irsayvid profile image
Divya Sri Darimisetti

Really insightful blog! Clear and easy to follow.

Collapse
 
aniket762 profile image
Aniket Pal

Thanks Divya 💖

Collapse
 
gourab18 profile image
Gourab Nanda

Always wondered how tech companies solve this problem. Now I have found my answer😀😀😀😀.

Collapse
 
aniket762 profile image
Aniket Pal

Thanks @gourab18 💖

Collapse
 
snelson1 profile image
Sophia Nelson

Nice work

Collapse
 
aniket762 profile image
Aniket Pal

Thanks Sophia :)

Collapse
 
sayantanmaiti profile image
Sayantan Maiti

Everything is explained in a clear and concise way. Really interesting blog!

Collapse
 
aniket762 profile image
Aniket Pal

Thanks @sayantanmaiti 💖

Collapse
 
iamakl profile image
Ankush Lohani

so insightful, nicely written

Collapse
 
aniket762 profile image
Aniket Pal

Thanks Ankush 💖