9:34Using Github Desktop for Unity — Part 3: How to resolve merge conflictsTerresquall2.9K viewsView & Download
12:27Unity3D HowTo: Avoid Scene Merge Conflicts with GITJason Weimann (GameDev)25.0K viewsView & Download