MAC的SourceTree外部差异对比使用BeyondCompare 爱被打了一巴掌 2022-05-21 01:54 493阅读 0赞 # 1 # 打开beyondcompare,打开主菜单,选中Install Command Line Tools … ![这里写图片描述][SouthEast] # 2 # 命令行建立连接 ln /Applications/Beyond\ Compare.app/Contents/MacOS/bcomp /usr/local/bin/ * 1 # 3 # 打开SourceTree,打开主菜单,选中diff选项卡,配置: \- 可视对比工具:自定义… \- 比较命令:/usr/local/bin/bcomp \- 参数:$LOCAL $REMOTE \- 合并工具:自定义… \- 合并命令:/usr/local/bin/bcomp \- 参数:$LOCAL $REMOTE $BASE $MERGED ![这里写图片描述][SouthEast 1] # 4 # 打开sourcetree,选中master,右键dev分支选择与当前对比。在右下方出现: ![这里写图片描述][SouthEast 2] 选择外部差异对比,sourcetree会自动加载beyondcompare,并对比文件: ![这里写图片描述][SouthEast 3] 左侧为当前分支master,右侧为对比分支dev。 转载于:https://blog.csdn.net/alexander\_phper/article/details/71194887 [SouthEast]: /images/20220521/5fcae9b3d1f645f98007427c1faf8520.png [SouthEast 1]: /images/20220521/8274a67c7a6244fba0d5090d5ea5249b.png [SouthEast 2]: /images/20220521/5dfaf8dd486d4d5aad4774c7c49737ff.png [SouthEast 3]: /images/20220521/9e848e2ba20b499fa2734cf1a7c84d22.png
还没有评论,来说两句吧...