110. Tools and Unitilities

This post shows how you can resolve a merge conflict with git with the help of the open-source application KDiff3.

KDiff3 is a file and folder diff and merge tool which compares and merges two or three text input files or folders,shows the differences line by line and character by character (!),provides an automatic merge-facility,has an editor for comfortable solving

Many people want to use KDiff3 with some version control system. But when that version control system calls KDiff3 using command line parameters that KDiff3 doesn't recognise, then KDiff3 terminates with an error.

- provides an automatic merge-facility and - an integrated editor for comfortable solving of merge-conflicts - has support for KDE-KIO (ftp, sftp, http, fish, smb), - has an intuitive graphical user interface, - provides a context menu for KDE-Dolphin and

Since merging these can become very tedious, KDiff3 offers support with two possible strategies: Just insert the history information from both contributors at the top or sort the history information by a user defined key.

But when that version control system calls KDiff3 using command line parameters that KDiff3 doesn't recognise, then KDiff3 terminates with an error. The integration settings allow to specify command line parameters that should be ignored by KDiff3.

本文将详细介绍如何使用 Kdiff3 作为 Git 的 Mergetool，高效解决合并冲突。 Kdiff3 简介 Kdiff3 是一款功能强大的文本和二进制文件比较工具，它支持多种文件格式的比较，并提供直观的界面。