last update: 12/09/2019
beta version author: Mengyu Chen
Updated version: Carol He
- Unity 2018 4.0f1 LTS You can download here: https://unity3d.com/get-unity/download/archive
- Git LFS Make sure you have Git LFS: https://git-lfs.github.com/
Refer to *Bird View Navigation_mengyu_2019.pdf"
git checkout --ours folderA/filename.xxx
git checkout --theirs folderB/filename.yyy
git stash