When using git under the command line, merge is very inconvenient. How to configure the graphical tool?
PHP中文网2017-05-02 09:29:56
[diff]
tool = tortoisediff
[difftool]
prompt = false
[merge]
tool = tortoisemerge
[mergetool]
prompt = false
keepBackup = false
[difftool "tortoisediff"]
cmd = "TortoiseMerge.exe" -mine:"$REMOTE" -base:"$LOCAL"
[mergetool "tortoisemerge"]
cmd = "TortoiseMerge.exe" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"
It’s really fun to use the command line with tortoisemerge
PHPz2017-05-02 09:29:56
As long as the system has image operation, there are a lot of GUI Git clients, which can operate Git very conveniently. I recommend one of them: SourceTree, which is full-featured and cross-platform.
https://www.sourcetreeapp.com/