Configuring the Git Diffmerge tool

Git's command line seems to have no particularly useful UI tools, whether it's from Android studio or something else, and it doesn't seem to be a complete substitute for the command line. Plus there's nothing more normal for Git than diff and merge.

"git encourages frequent use of branching and merging in the workflow, even if it does not matter many times a day." Once you understand the concept of branching and use it skillfully, you will realize why git is such a powerful and unique tool that really changes the way you develop. "It's not what I said, but it's very appropriate.

I use the tool is diffmerge, relatively light, the official website is: http://www.sourcegear.com/diffmerge/

After installing the C drive, it needs to be configured in Git, diffmerge_4.2.0.697.stable_x64. msi, where EXE files are C:\Program files\sourcegear\common\ Inside the Diffmerge is Sgdm.exe.

1. Installing Diffmerge

2. Configure the Sgdm.exe path C:\Program files\sourcegear\common\diffmerge to the Windows environment variable under path

3. Configure Git

Diff'sgdm ' $LOCAL "$REMOTE"'--'  Diffmerge--merge--result= "$MERGED" "$LOCAL" "$ (if test-f" $BASE "; Then echo "$BASE"; else echo "$LOCAL"; FI) "" $REMOTE "'true

4. Use Diffmerge

When the code handles the merging state, you can use the command git mergetool boot tool

Configure the Git diffmerge tool