How do you merge in GIT on Windows?

Question

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

Answer 1

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