如何在Windows上的GIT中合并？ [英] How do you merge in GIT on Windows?

问题描述

我试图使用GIT但是对我来说，最大的问题是没有合并工具。至少msysgit不给我任何东西。如何在GIT中合并？有没有什么伟大的工具，或者我必须使用WinMerge或这样的应用程序？

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?

我使用Java和Eclipse。

I use Java and Eclipse.

推荐答案

我建议 kdiff3 。安装它，并放置如下：

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

.gitconfig

要编辑全局配置（.gitconfig）： git config --global --edit

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

您的计算机上的安装路径可能与 c：/ Program Files不同（86）/KDiff3/kdiff3.exe 。新新新新旗新新旗新新旗新新旗新新旗新新旗新新旗新旗旗新新旗新旗新旗旗新新旗新旗旗新新旗新旗旗新新旗新旗不要忘了你必须使用转发斜杠， / 和不向后（ \ ）像本地程序通常一样。

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.

这篇关于如何在Windows上的GIT中合并？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！