TexasHawk Posted March 9, 2021 Report Share Posted March 9, 2021 ...but when I do it, not all of the changes make it. Some do, but some don't. I am currently merging from the source and destination, and it's worked OK so far, but in the last few days the merges seem to be taking some things and excluding some others. Should I only take source in that case? Thanks! Link to comment Share on other sites More sharing options...
calbzam Posted March 9, 2021 Report Share Posted March 9, 2021 Hi, Would it be possible to share the files (merge contrinbutors) with us (via private) so we can run the same merge operation and evaluate the result. We don't have tracked any issue like the one you are reporting. Regards, Carlos. Link to comment Share on other sites More sharing options...
TexasHawk Posted March 9, 2021 Author Report Share Posted March 9, 2021 Before I do that, should I do a merge like where I want to take all the source changes (my artist) and not specifically merge them? I feel like I may be doing the merge wrong. I just want to take all their changes on a given prefab, and I want to make sure I'm doing that correctly! Link to comment Share on other sites More sharing options...
calbzam Posted March 9, 2021 Report Share Posted March 9, 2021 Hi, if you run a merge and there are not manual conflicts, all the changes from the source will be directly integrated into the destination. Plastic will be able to merge the file changes as soon as you don't modify the same file line in bith contributors (for the text files). If the same file line is modified, you will need to manually resolve the merge conflict. 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