Resolve merge conflict for Unity Game Engine
I’m working in a group of 4 teammates for a unity 3D game project on the weekends. It’s pretty fun, but we have encounter problems with version control. Using Git and Github, there are many merge conflicts that it’s not easy to resolve, not simply de...
victorleungtw.hashnode.dev2 min read