soul

I just want a user to just push changes rather than merging. -- and also restrict a user from switching changest to a particular branch. I wish to exclude new users from tampering with the other branches especially the main branch

same here, asia east

Hey guys, this has been appearing for a while now. nothing bad has happened so far tho. project seems to be working fine. hopefully, you guys could have some insights on why this is occuring. Thanks!

Hey Carlos! Thanks for the reply! So I assume its not a problem with the merge tool but more so on the mismanagement of our user workflow. What would be the best approach to avoid this problem in the context of a unity project? Thank you, the team is loving PlasticSCM so far!

An error still keeps on popping up saying "Too many differences...", I followed what was recommended to change / update my merge tool on my preferences but I still keep getting the error. My first assumption is, I was not able to set up my merge tool correctly. Here are some screenshots: This is inside my mergespecificfile.txt from Unity I can confirm that It's the correct mergespecificfile.txt because different errors popup on PlasticSCM when I try changing it. Help would be greatly appreciated!