我需要在 git pull
后解决一些冲突。
$ git pull
CONFLICT (rename/add): Renamed vignette_generator_mashed.h->vision_problem_8.h in 49423dd0d47abe6d839a783b5517bdfd200a202f. vision_problem_8.h added in HEAD
Added as vision_problem_8.h~HEAD_1 instead
Removed vignette_generator_cross_square.cc
Automatic merge failed; fix conflicts and then commit the result.
于是我上网搜索了一下,发现有人说可以使用git mergetool
。但是我得到了以下结果:
$ git mergetool
merge tool candidates: meld kdiff3 tkdiff xxdiff meld gvimdiff emerge opendiff emerge vimdiff
No files need merging
$ git mergetool opendiff
merge tool candidates: meld kdiff3 tkdiff xxdiff meld gvimdiff emerge opendiff emerge vimdiff
opendiff: file not found
那这是否意味着我需要安装一些东西?
如果我只想使用git pull
获取的版本覆盖一切,该怎么办?
mergetool
的示例:https://dev59.com/KHRA5IYBdhLWcg3wyRJ7 - VonC