In Git what to view and edit merged the best tool? I want a 3-way merge view, the "I" and "their" and "ancestors" and the fourth "Output" panel in a separate panel.
In addition, the instructions to call the tool is also great. (I still have not figure out how in such a way to start kdiff3, it will not give me an error.)
My operating system is Ubuntu.
#1st Floor
little http://gitx.frim.nl/
Use large there will be some errors when submitting set, but the change is very suitable for browsing and selecting a different changes to segment and submit.
#2nd Floor
You can try P4Merge .
The difference between using visual file version P4Merge. Resolve conflicts caused by the parallel or concurrent development by color coding.
Features include:
- Highlight and edit text files differences
- Choose to include or ignore the end of the line or space
- Recognition Windows (CRLF), Mac (CR) and Unix (LF) line-ending convention
- Use the command-line parameters and start the application from a non-Perforce
- Display line numbers compare and merge files
- It has been modified to exclude the only or changed files
- Filter files by name or extension
- Modification of the organization's assets in a familiar file / folder hierarchy
- Compare JPEG, GIF, TIFF, BMP and other file formats
- Use Qt API extensions
- Displayed side by side or superimposed image
- Highlight the differences in the superimposed image
#3rd floor
My favorite visual merge tool is SourceGear DiffMerge
- This is free of charge.
- Cross-platform (Windows, OS X and Linux).
- Clean visual UI
- You expect all the functional differences (Diff, Merge, Folder Diff).
- Command line interface.
- Available keyboard shortcuts.
#4th floor
Meld is a diff / merge tool.
Here's how to install it:
- Ubuntu的
- Apple computer
- Windows : "Recommended Meld for Windows version is the latest version, available from http://meldmerge.org obtained in the form of MSI"
#5th Floor
I heard the good news about the kdiff3.
#6th floor
If you are just looking for a difference beyond comparison tool, it would be wonderful: HTTP : //www.scootersoftware.com/moreinfo.php
#7th floor
You can configure your own merge tool with the " git mergetool" used together.
Example:
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd p4merge '$BASE $LOCAL $REMOTE $MERGED'
git config --global mergetool.p4merge.trustExitCode false
When you're in it, you can also set it to " git difftool" the git difftool:
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd p4merge '$LOCAL $REMOTE'
Please note that in Unix / Linux, you do not want to shell will $BASEbe resolved to a variable - it should actually be in ~ / .gitconfig file to make it appear the work.
Building # 8
Merge Araxis http://www.araxis.com/merge I use it but I use it on Windows ... it's not free on Mac OS X ... but it has some nice features ..... better though the windows.
House # 9
You can transfer git mergetool -t=<tool>or --tool=<tool>change git mergetool used to --tool=<tool>. To change the default value (from vimdiff), please use git config merge.tool <tool>.
#10th floor
Diffuse is my favorite, but of course I am biased. :-) It is very easy to use:
$ diffuse "mine" "output" "theirs"
Diffuse small and simple text merge tool written in Python. Diffuse reflectance, you can easily merge, edit and view code changes. Diffuse is free software.
House # 11
You can install on Linux, Mac or Windows ECMerge diff / Merge tool . It is pre-configured in Git, so just use git mergetoolthe job done.
House # 12
Beyond Compare 3 , my favorite, the Pro version has a merge function. The combined benefit is that it allows you to see all four views: base, left, right, and merged result. It's not as good as visual effects P4V, but more than WinDiff. It integrates a number of source code control , it can run on Windows / Linux. It has many features, such as advanced rules, editions, manual alignment ......
Visual Client Perforce ( P4V ) is a free tool that provides one of the most definitive merger interface (see some screenshots ). Available for all major platforms. My main gripe of the tool is its "read only" interface . You can not manually edit the file, you can not be manually aligned.
PS: P4Merge included in the P4V. Perforce tools are not trying to get the customer becomes a bit difficult.
SourceGear Diff / Merge may be my second free tool choice. Check the merger screen shot , you will find that it has at least three views.
Meld is a free tool updates, I prefer SourceGear Diff / Merge : now it also applies to most platforms (Windows / Linux / Mac), have native support for some of the source code control (such as Git ) unique advantages. Therefore, you can use the simpler historical differences on all files. The combined view (see screenshot ) only three panes, as SourceGear Diff / Merge the same . This makes it more difficult to merge in complex situations.
PS: If one day tool supports five consolidated view , this is really great, because if you choose to submit in Git you really do not have a foundation but two. Two bases, two changes, a merge.
House # 13
Meanwhile vimdiff
Once you learn vim (and you should IMHO), vimdiff just a little more beautiful orthogonal concepts to learn. To get online help vim:
:help vimdiff
This issue covers how to use it: How to Use vimdiff resolve conflicts?
If you mess up in the dark ages using the mouse, and you merged file is not great, I recommend meld.
House # 14
IntelliJ IDEA has a complex merge conflict resolution tools and Resolve magic wand, which greatly simplifies the merger:
House # 15
If you are using Visual Studio , Team Explorer built-in tools is a very good tool git merge conflict resolution.
House # 16
So for git merge, you can try:
DiffMerge can visually compare on Windows, OS X and Linux and merge files.
Meld ，是一个视觉差异和合并工具。
- KDiff3 ，一个差异和合并程序），它比较或合并2或3个文本输入文件/目录。
-
opendiff（macOS上的Xcode Tools的一部分），一个命令行实用程序，它从终端启动FileMerge应用程序，以图形方式比较文件或目录，包括合并 。
#17楼
我已经尝试了很多这里提到的工具，但没有一个是我正在寻找的。
就个人而言，我发现Atom是一个可视化差异和冲突解决/合并的好工具。
至于合并，没有三个视图，但它们全部合并为一个，每个版本都带有彩色突出显示。 您可以直接编辑代码，也可以使用按钮来使用您想要的任何版本的代码段。
我甚至不再使用它作为编辑器或IDE，只是为了使用git。 清洁用户界面，非常直接，而且可以高度自定义。
您可以从命令行启动它并传入要打开的单个文件，或添加项目文件夹（git repo）。
- 我还建议使用项目管理器作为在项目之间导航而不填满树视图的非常方便的方法。
我唯一的问题是刷新 - 当处理大型存储库时，原子可能很慢，无法更新您在其外部所做的更改。 我只是在我完成时总是关闭它，然后当我想再次查看我的更改/提交时重新打开它。 您也可以使用ctrl + shift + f5重新加载窗口，这只需要一秒钟。
它当然是免费的。
#18楼
我使用不同的工具进行合并和比较：
git config --global diff.tool diffuse
git config --global merge.tool kdiff3
拳头可以通过以下方式调用：
git difftool [BRANCH] -- [FILE or DIR]
第二个是在使用git mergetool时调用的。
