Jump to content

Error Trying to Merge Branches


KnightFire
 Share

Recommended Posts

I got past this by choosing to accept only the source changes. Not ideal but it got past the error. I have updated to the newest LTS version of Unity in order to hopefully avoid these issues in the future. For curiosity's sake though how do I change what path that Plastic looks for the UnityYAMLMerge.exe if it isn't looking in the correct spot?

 

Link to comment
Share on other sites

  • 2 months later...

Alright so I know it's been a while but I'm still running into this error. I'd really like to be able to correct it the right way to stop having to merge things from source or destination then having to go in and fix the things that don't merge correctly. 

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...