Search the Community
Showing results for tags 'merging'.
Dear Plastic SCM Community Member, Are you interested in helping Unity improve its merging and collaboration tools? We are recruiting participants for a 1-hour usability study between September 9 - 15. We are looking for participants who have experience working in Unity as a part of a team. If you are interested in participating, please take this quick survey to see how you meet our target audience. We are excited to hear your valuable feedback. Thanks! https://unitysoftware.co1.qualtrics.com/jfe/form/SV_6uvDDpWU8F1o6Md Thank you, Alyssa from the Unity UX Te
Hi I am admittedly struggling with my merging with Unity files. Every time I merge there are always many conflicts in my project. I currently have 86 files with following extensions requiring manual merge, .txt , .meta, .asset When I right click on the files in the list I get 3 diff options, I select "Diff Destination Contributor with Sources" This then triggers KDiff to open as my defined Diff tool in preferences for the $text file type. Now my issue from this point is I don't seem to get the option to save changes I make after resolving conflicts in KDiff to the correct
I need a little assistance setting up permissions. Basically I would like to setup a repository with a main branch that can not be commited to or merged to by anyone but a single user. We work distributed, but have a main repo on our company server which we sync to. I'm trying to have it so that developers pull from the main repo, yet don't have rights on their local machine to commit or merge to the main branch. However, users should be able to start branches off of main, and merge within those branches. I've already created an integrator user on my domain, and assigned him to the rep
I have a changeset with two small changes in it. I want to undo one of these changes. I went to do a subtractive merge, and I have to do a full subtractive merge in order to complete it. I can easily just complete the subtractive merge, and then re-make the second small change, but I'm wondering is there a better way to do it, or is this just a lesson to really make even tinier commits?