Web base merge tool

I’m looking for a solution to automatize merges between two branches, and I’d like to know if there are good web based merge client for manual merge (when conficts arise, human will still be better than the machine).

I use a lot kdiff3 and find it very well suited for quickly choose which branch needs to be used, and edit the result and save it. I’d like to have almost the same thing but in a web browser (with a server in python, or php, or java,…). I know kdiff3 has a pretty good automatic merge algorithm, I’m not asking for porting it completely of course 🙂

  • How to include only selected files into git repository and exclude all the rest?
  • Git push failed,could not resolve host
  • Jenkins build number to be replaced with Tag or Commit ID
  • Why there are commits like “Merge branch 'master' of” in TFS
  • Git timeout on Qt Creator
  • As using gerrit, how to remove remotes tag?
  • Thanks.

  • IntelliJ Idea & Github: Clone Failed
  • How to push an Android Studio Project to a remote GitLab Repository
  • Private Repositories not found in SmartGit
  • Git push over webdav hangs
  • Getting into rebase -> merge cycle with Git
  • Shallow clone at a git hash tag
  • Git Baby is a git and github fan, let's start git clone.