A bot that solves conflicts in pull requests without manual intervention

Powered by SemanticMerge tech, it understands C#, Java, C, C++

Analyze your github repos
mergedroid

The problem with pull requests

GitHub can’t automatically merge many pull requests

GitHub can’t automatically merge many pull requests because of conflicts that require manual intervention.

The merge algorithm in Git is just text based

This is because the merge algorithm in Git is just text based and it doesn’t take the programming language into account.

Up to 16-30% of pull requests can be fully automated

Using a merge tool that understands the syntax can help automate up to 16-30% of pull requests that would normally need manual merge.

Developers save time not having to manually merge

Developers save time not having to manually merge, but also in time consuming and productivity-killing context switches.

Analyze your GitHub repo the % of merges mergedroid can automate

Analyze your GitHub repo for the % of merges that mergedroid can automate

Analyze

How mergedroid works

1

mergedroid installs a WebHook in your GitHub repos so it is notified each time a pull request can’t be merged.

2

It will try to merge the pull request using SemanticMerge technology.

3

If successful, it will push the change back to GitHub so the pull request will automatically merge.

4

The commit with the merge resolution will have mergedroid as the author so you can easily track it in your repo. The pull request is updated with a meaningful comment.

5

You will receive reports telling you how many merges were resolved by mergedroid.

How mergedroid works graphic

How the merge is resolved

Consider a situation like the following, where the pull-request can’t be merged automatically by Git without manual intervention:

How the merge is resolved, step 1

mergedroid will try to “merge down” master into main as follows:

How the merge is resolved, step 2

It will only commit and push back to GitHub if the merge was automatically resolved using SemanticMerge technology. Otherwise, it will report the merge can’t be automated.

Later, GitHub will merge the pull-request back to master, even with fast-forward:

How the merge is resolved, step 3

What if the merge can’t be solved automatically by mergedroid?

You can always take advantage of our other products: gmaster and SemanticMerge to help you solve manual conflicts!
gmaster can do amazing things like helping you solve conflicts involving code moved across files! (mergedroid uses the same technology behind the scenes).

Learn more about gmaster and SemanticMerge.

SemanticMerge screenshot

We are working on a full web interface to let you solve conflicts that mergedroid can’t automate directly from your browser, with full semantic capabilities.

Analyze your repos to find how much mergedroid can help you

Analyze your GitHub repo for the % of merges that mergedroid can automate

Analyze