git 合并
要将两个分支的开发历史合并到一起，请访问Tools >Git >Local Repository 并选择Branches 。
在Git Branches 视图中，右键单击远程分支，然后在右键菜单中选择合并选项。如果你要合并的提交可以通过跟踪第一个提交的历史记录到达，那么就没有分歧工作需要合并到一起。要让 Git 将分支指针向前移动，请选择Merge <remote branch> into <local branch> (Fast-Forward) 。如果不想快进分支，请选择Merge <remote branch> into <local branch> (No Fast-Forward) 。
配置合并工具
只支持图形合并工具。你可以在命令行中配置要使用的合并工具。例如，要使用KDiff3合并工具，请输入以下命令：
git config --global merge.tool kdiff3
Copyright © The Qt Company Ltd. and other contributors. Documentation contributions included herein are the copyrights of their respective owners. The documentation provided herein is licensed under the terms of the GNU Free Documentation License version 1.3 as published by the Free Software Foundation. Qt and respective logos are trademarks of The Qt Company Ltd in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.
