CadmusLabs Posted August 31, 2020 Report Share Posted August 31, 2020 Hello! We have a pretty big project and sometimes people edit same file at the same time - Unity scenes in this case. Unity has merge tool for it but it is not effective with the size and complexity of scenes we have. So what I want to do is to prevent .unity files from merging - users should be able only to choose keeping source or destination version. How can I do that? Thank you. (Locking files still does not work for replication with local repos, right?) Link to comment Share on other sites More sharing options...
calbzam Posted September 1, 2020 Report Share Posted September 1, 2020 Hi, In Plastic every merge involves 3 changeset contributors (source, base and destination) and you cannot select to merge some specific files. You are merging the full changeset. What you can do is in the merge panel selecting to keep source/keep destination for the different conflicts. This way, the external merge tool won't be launched to solve the manual conflict because you predefine the contributor to keep. The "cm merge --help" command also allows to automatize the conflict resolution based on your needs. Regards, Carlos. 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