How do you merge in GIT on Windows?

I tried to use GIT however for me the biggest problem with it is that there is no tool for merge’ing. At least the msysgit does not give me anything. How can I merge in GIT? Are there any great tools for it or do I have to use WinMerge or application like that?

I use Java and Eclipse.

  • Why is not recommended to have an Eclipse project folder as a Git repository?
  • How Do I Get Back Untracked Files I Stashed with Git?
  • Tons of git commits after pulling down a remote branch
  • How to rename Java packages without breaking Subversion history?
  • How do I add existing eclipse java project to git
  • How to publish a java project source files on GIT?
  • Mirroring repository via fileserver
  • gitignore - include everything in repo directory, ignore nothing, completely discard any user/machine ignores
  • How to get SHA of commit for Xcode Bot “Run Script” Trigger? Updating status of tests on Github
  • Is storing FTP credentials in git-ftp settings in repository insecure?
  • Git doesn't work after upgrading Mac OS X El Capitain
  • How to add git repo path in the Dockerfile?
  • 5 Solutions collect form web for “How do you merge in GIT on Windows?”

    I suggest kdiff3. Install it and put something like:

    [merge]
            tool = kdiff3
    [mergetool "kdiff3"]
            path = c:/Program Files (x86)/KDiff3/kdiff3.exe
    [diff]
            tool = kdiff3
            guitool = kdiff3
    [difftool "kdiff3"]
            path = c:/Program Files (x86)/KDiff3/kdiff3.exe
    

    in your .gitconfig

    To edit the global config (.gitconfig): git config --global --edit

    The installation path on your machine may be different from c:/Program Files (x86)/KDiff3/kdiff3.exe. Replace that string above with actual path to your kdiff3 binary. And don’t forget you have to use forward slashes, /, and not backward ones (\) like native programs usually do.

    For me (windows xp, kdiff3 0.9.96 and git 1.7.5.1), Jan Hudec’s answer did not work. Here is my setup:

    [diff]
            tool = kdiff3
            guitool = kdiff3
    
    [difftool]
            prompt = false
    
    [difftool "kdiff3"]
            path = /home/username/bin/difftool-kdiff3.sh
    

    and

    #!/bin/sh
    
    # Passed the following parameters from git
    #  --auto --L1 "somefile (A)" --L2 "somefile (B)" /tmp/4VhUw0_somefile somefile
    
    LOCAL=$6
    REMOTE=$7
    
    "C:/Program Files/KDiff3/kdiff3.exe" $(cygpath -w "$LOCAL") "$REMOTE"
    

    Kdiff3 is a great merge tool that I like to use in combination with git.

    http://www.mainelydesign.com/blog/view/using-kdiff3-as-git-gui-merge-tool-on-windows-xp-windows-7

    Since you mention you use Eclipse, you can use EGit’s merge tools, which provides a convenient way to handle conflicts:

    enter image description here

    enter image description here

    You don’t actually need another tool specifically for merging, since any decent Git provider should be able to take care of that, even msysgit itself. In your case where a GUI like WinMerge is desirable, there is EGit, which is the Git team provider for Eclipse, although its merge function can be somewhat unstable since the project is still relatively new. There is also TortoiseGit which I use for most git operations on Windows inclusive of merge.

    Git Baby is a git and github fan, let's start git clone.