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

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