maxahn

 1: def say_hi
 2: def say_hi(name)
 3:   "Hey, #{name}"
 4: end
 5: say_hi("Hannah")
 6: a = "Hey"
 7: b = "Hey"
 8: a == b
 9: a === b
10: a = 1343

maxahn

Unity has a built in tool called UnityYAMLMerge that can be used to automatically merge scene files and prefabs. The tool by itself is limited in that it cannot resolve conflicts when collaborators edit the same game object in a scene though it works fine when adding, deleting, and editing different objects. To resolve the merge conflicts Smart Merge can't handle, the user must install and enable a fallback tool to manually fix the conflict themselves.

1. Add the following lines to your local .git/config file.

[merge] 
     tool = unityyamlmerge 
[mergetool "unityyamlmerge"] 
     trustExitCode = false 
     keepTemporaries = true 
     keepBackup = false