Yuuns Posted August 16, 2022 Report Share Posted August 16, 2022 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. Link to comment Share on other sites More sharing options...
blue Posted August 17, 2022 Report Share Posted August 17, 2022 This issue has been resolved via Plastic SCM support ticket. 1 Link to comment Share on other sites More sharing options...
blue Posted August 23, 2022 Report Share Posted August 23, 2022 Please make sure NetworkAllowList is configured properly if you face the similar situation. 1 Link to comment Share on other sites More sharing options...
Recommended Posts
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 accountSign in
Already have an account? Sign in here.
Sign In Now