In the Plastic Options you can turn on manual conflict resolution in case of a conflict which is not
trying to resolve the conflict automatically, even if it could. This works for scripts.
For scene files however I noticed that this is ignored and the scene file conflicts are still automatically resolved (and in some cases this is really not what you want). The merge tool is only opened when there is a genuine contradiction in some value.
Is this a bug or is this the wanted behavior? It seems like this would make a lot of sense for double checking dangerous scene merges.
(I am using Plastic 11.0.16.8798)
On a normal basis, if Plastic can handle the merge conflict, it won’t ask the user to resolve a manual conflict. Users are asked to resolve manual conflicts (eg: for text files when two users modify the same line in parallel).
But you can customize it under Plastic GUI → Preferences:
PD: Do you know that you can enable file locks to avoid merge conflicts with assets (or binary files)?
Thanks for your response.
I understand that, but when I choose “manual” this has no effect on scene files. I cannot resolve them
manually even if I want to.
(except contradicting files)
For example when I add two different GO on different branches to the same scene… this is technically a conflict, right? My expectation would be that if I choose “Manual conflict resolution” in that case I would be able to use the mergetool. But it doesnt happen.
(For scripts an analog example does work)
Maybe this is an issue with the different merge tools?
Update:
This seems to be an issue with the merge tool configuration.
I tried the same thing on a mac with a slightly older plastic version: (11.0.16.8577)
and the behavior is different. There I can manually merge the scene if I choose to do so in the options.
This still feels like a bug because the default Windows configuration has a different behavior.
I didn’t touch any config files.
I cannot reproduce it on Windows. With a simple text file merge, the conflict is automatically resolved by default. And if I change the setting, the text “mergetool” appears to resolve the conflict manually.
Could we get some temporary access to your repo to reproduce the issue? Not sure if you could be using some other custom configuration in Windows that could be affecting this behavior.
Do you have configured the external YAML merge tool to resolve Unity scene conflicts?
Does the same issue also happen when merging text files?
The issue appears only on SCENE FILES in my case.
Text files and scripts work as expected. I have not changed the default merge tool configuration.
This is the configured mergetool for .prefab and .unity files:
"/pathOnMySystem.../UnityYAMLMerge.exe" merge -p "@basefile" "@sourcefile" "@destinationfile" "@output"
Could you also share the the YAML Merge tool configuration in your macOS setup?
My explanation was related to the text merge tool. I will need to check if the UnityYAMLMerge tool supports forcing the manual resolution of conflicts.
There is no explicit configuration on the macOS side for .prefab and .uinity files.
I’ve been double-checking it and I think the YAML merge tool doesn’t support forcing the manual resolution (while the text merge tool does). If you configure the YAML merge tool in macOS to resolve the Unity scene conflicts, the same behavior should happen.
Can you remove the “-p” flag from the command to check if it helps?
If you enable the text merge tool to resolve your Unity scene merges, you could at least force the manual resolution, but not sure it’s useful because this merge tool is useful just to resolve merges involving text files.
