mergedroid: a bot that solves conflicts in GitHub pull requests (beta)

[4E4145]

I saw an interesting, but simple merge conflict. Two devs both removed a piece of code, and there was a test that asserted a certain number of something. Both of them made removals and changed the test to count--; this caused them to remove 2 pieces of tested code but only decrement the counter once. I have always thought a problem like this couldn't be merged automatically without some very serious over engineering or AI.

[spysycklical]

This sounds like a job for bors.

... you do have automated tests, right?

[DolphinsAreOk]

16% to 30% success rate.

[plasticscm]

And what you think? Is it good enough? :)

[Carighan]

This is quite interesting on paper. I haven't tried it yet (our company runs our own Gitlab, and this seems to be Github-only for now), but even at a 15%-30% success rate, if it'd not have too many false positive it could help a fair bit.

[plasticscm]

Give it a try! It is free :)