I'm working on a Unity 3D project with my friend. We've been using Plastic SCM for collaboration. Everything was nice till I try to merge my branch to main branch after he merged his branch. But when he tries to merge his branch to main branch after me, he doesn't get any errors. We're working on a same scene but we're changing different things on the scene.
It gives a conflict on the scene but I'll have an error when I try to resolve conflicts. Again my friend won't have an error and it resolves the conflicts without any errors.
