Unity prefab scene conflict merge tool unityyamlmerge

done unity All of my classmates know that prefab scene File merging is annoying
In fact, the government has its own tools

https://docs.unity3d.com/cn/2018.4/Manual/SmartMerge.html

that .gitconfig Where are the documents

git There are three configuration files of according to priority
local > global > system

Enter... Directly on the command line git config View available commands

for instance see system To configure
After entering the following command, it will automatically use vscode Open this profile
git config -e --system
C:\Program Files\Git\etc\gitconfig

git config -e --global
C:\Users\Administrator.gitconfig

git config -e --local This is in the project .git Folder File name config
You can find The file names of the three configurations are different

Double slash
cmd = ‘C:\Program Files\Unity\Editor\2020.3.10f1c1\Editor\Data\Tools\UnityYAMLMerge.exe’

install Diff Merge

Encountered a conflict Just type... On the command line git mergetool
He'll call first unity Merge the self-contained If it doesn't work out It's automatic Diff Merge Interface That's all right.

I happened to see an article about slashes Well written
Be careful window The first stroke of this word , That's the letter w The first stroke of , What is it? ？ you 're right , It's a backslash , So every time I think windows In the file path, use / still \ When , First of all, think of windows What was the first stroke of , The answer comes naturally . As windows Opposites ,linux or unix The file path is used naturally / 了 .