AlternativeTo Logo

Apps with 'Conflict resolver' feature

  1. SmartGit is a front-end for the distributed version control system Git and runs on Windows, Mac OS X and Linux. SmartGit is intended for developers who prefer a graphical user interface over a command line client, to be even more productive with Git.
    show more