![]() Git config -add false # For macOs # - path to the current location of the Unity editor # Do not trusts to exit code of UnityYAMLMerge Git config -add merge.tool unityyamlmerge So, to disable their generation, use the setting: And in general, you can always rollback the merge without using this file. orig, which happen to secure the process, but you definitely do not need to store it further. Also, for parameter conflicts, we need a tool with three-way merge capabilities called through mergespecfile.txt.Īll settings will be performed on local repositories, as they are specific to Unity, and their global setup may affect working with other types of projects.Īfter resolving the conflict, git creates files containing the original data, *. To resolve object conflicts, we will additionally need to configure UnityYAMLMerge as a git mergetool. The article "Unity and git" provides the initial git configuration necessary to start any project.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |