Git config -add '/Unity.app/Contents/Tools/UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"' # For Windows # git config -add 'C:\Program Files (x86)\Unity\Editor\Data\Tools\UnityYAMLMerge.exe merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"' Git config -add false # For macOs # - path to the current location of the Unity editor
#SUBLIME MERGE CONFLICT CODE#
# 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. Parameter conflicts, not resolved after the first stage, fixed by default git tools.Objects combined on the scene with UnityYAMLMerge, so you can use an editor to resolve it.Respectively, their solution divided into two stages: We can divide such conflicts in Unity into two constituent: conflicts of objects and conflicts of parameters.
Still, it is a bit concise and does not focus on the essential aspects of its use, which we will analyze in detail. Documentation provides all the necessary information on using the tool. To resolve conflicts with scenes and prefabs, Unity offers to use a utility called UnityYAMLMerge. In Unity, this problem is fully applicable to the scenes and prefabs. In the previous article, "Custom Elements in the Unity Editor,“ we briefly mentioned the problems that may arise when using all sorts of visual editors in a distributed manner, such as blueprints in Unreal.
#SUBLIME MERGE CONFLICT HOW TO#
Since I did not manage to commit before my comrade, it’s time to fulfill the promise given in the article about configuring git to work with Unity and figure out how to use UnityYAMLMerge to resolve the conflicts.
0 kommentar(er)
