KnightFire

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.

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?

I have an error when I'm trying to merge a branch and I'm not sure what to do to fix it. I resolved the conflicts but this error remains. Any help with this would be appreciated.

Thank you for your reply! I think I have figured out how to get people to work on the same project as me effectively. I have already added members to my organization. I'm more curious about things from this video Are the Merge tools like YAML necessary merge tools I need to learn how to add? Are there any other tools for beginners I need to add.

I know this is pretty basic stuff most people know but I am struggling, and I want to start off on the right foot. If there is already a thread for this, please direct me to it so I can learn! I have gotten Plastic installed and set up. I can create branches and I'm hoping I am understanding how to use the program at least on a basic level. I'm trying to work with a small team on a video game in Unity. Everything seems to work for me, but I had some problems adding people and then having them be able to push changes and be in sync. I think it is because they need to create a blank project and then connect to the current repository, but I am unsure. I've also seen other small guides like having .scene files in plastic that help and other things. I really need a good beginner guide on how to make sure I have started everything correctly and have any add-ons I need and how to get new people connected to a current project the right way. Any tips and tricks to help me would be greatly appreciated. I know this is pretty basic stuff but I tried looking information up and watching the videos and they are all years old and thing have been updated since then. Again I'm sorry if this thread already exists.