但是,我想知道是否有一种交互式和视觉化的方式来解决冲突。例如,如果pull检测到冲突,弹出一个基于GUI的冲突工具(如P4Merge)。这种方法可行吗?
我一直在手动解决冲突,这非常痛苦。
例如,这是来自SourceTree的git pull消息。
git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master
From W:\repo\
* branch master -> FETCH_HEAD
Updating 33c07bf..41e0249
error: Your local changes to the following files would be overwritten by merge:
foo.cpp
goo.cpp
goo.hpp
Please, commit your changes or stash them before you can merge.
Aborting
Completed with errors, see above.