Just want to merge a prefab and take all the contributor changes....

[TexasHawk]

...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!

[calbzam]

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.

[TexasHawk]

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!

[calbzam]

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.