DEV Community

Discussion on: Merging Pull Requests Like a Pro With Mergify

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 Author

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?