Unity uses Git (Source Tree) to resolve conflicts after merging

GUID conflict

Open the scene after merging and find that the GUID index of the prefab is missing

processing steps

1. Find the mata file corresponding to the prefab
2. The high probability of opening is due to the conflict in the mata file when merging, but SourceTree will not detect the conflict in the mata file
3. There will be two GUIDs in the file with conflicting merge symbols
4. Just delete the redundant code

---