Merge requests in Git and Hg repositories can now be managed with a single click. This makes it super easy to accept code contributions to your project. With the click of a button you bypass having to run merge commands by hand.
Merge requests are automatically analyzed for any conflicts. Merge requests without conflicts clearly display a “Merge” button. Just click the button to merge the code!
For merge requests with conflicts, use your local git or hg tools to resolve any conflicts manually by using the commands that are provided.
Thanks to Apache Allura, the platform behind the repositories at SourceForge, for this merge functionality. To further improve merge requests at SourceForge, consider contributing to Allura; Allura also powers SourceForge’s wiki, forums, tickets, and admin pages.