Jump to content

Error occurs when I try to resolve conflicts


Yuuns
 Share

Recommended Posts

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.

image.thumb.png.0548066b02f538ac3d76884d81d6bae7.png

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...