We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
平台: MAC
下载kdiff3(我用过最好用的git合并对比工具):
官网下载: http://sourceforge.net/projects/kdiff3/files/
下载完成后, 修改gitconfig
打开git全局命令:
open ~/.gitconfig
修改/添加 以下配置
[merge] tool = kdiff3 [mergetool "kdiff3"] cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" trustExitCode = false path = /Applications/kdiff3.app/Contents/MacOS/kdiff3 [mergetool] keepBackup = false [diff] tool = kdiff3 [difftool "kdiff3"] cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3 $LOCAL $REMOTE
场景: 我们要在test2分支, 合并test1的分支
git merge test1
发现冲突文件 modules/index/module.js
modules/index/module.js
使用工具进行合并:
git mergetool modules/index/module.js
kdiff3 的界面说明图2:
操作图3:
合并思路:
The text was updated successfully, but these errors were encountered:
No branches or pull requests
平台: MAC
目录
配置方式
下载kdiff3(我用过最好用的git合并对比工具):
官网下载: http://sourceforge.net/projects/kdiff3/files/
下载完成后, 修改gitconfig
打开git全局命令:
修改/添加 以下配置
实例使用
场景: 我们要在test2分支, 合并test1的分支
发现冲突文件
modules/index/module.js
使用工具进行合并:
kdiff3 的界面说明图2:
操作图3:
合并思路:
The text was updated successfully, but these errors were encountered: