Using Github Desktop for Unity — Part 3: How to resolve merge conflicts
Accompanying Article:
https://blog.terresquall.com/2024/12/...
Chapters:
0:00 Introduction
0:22 What are merge conflicts?
2:03 What happens if a merge conflict occurs
2:24 How do we resolve merge conflicts?
3:09 Resolving script merge conflicts
4:41 Resolving prefab and scene merge conflicts
5:18 Caution regarding resolving prefab/scene conflicts
5:55 Safer way of resolving prefab/scene conflicts
7:04 Resolving merge conflicts caused by deleted files
7:36 Ways to prevent merge conflicts
9:17 Outro
Music:
Jane Street - TrackTribe
Modern Situations - Unicorn Heads