Please note that I am still experimenting with using this driver, and it may not work with other merge tools besides P4Merge, so if you use it and notice a problem please leave a comment below. Here the force option is specified because Git uses fully random filenames for the different versions of a file being merged and UnityYAMLMerge does not use the "destination" parameter to detect file type. gitattributes file discussed later: ĭriver = 'C:/Program Files/Unity/Editor/Data/Tools/UnityYAMLMerge.exe' merge -force -fallback none %O %B %A %P To help catch these cases, it is possible to configure a custom "merge driver" and specify file types that should use it in the. It's also possible that Git's merge algorithm ignores a true conflict, though less likely. For example, say a property was simply moved around, but its value was unchanged. Ideally Git could use UnityYAMLMerge during its initial conflict detection (during pull or merge commands) to avoid Git displaying a conflict when one may not truly exist.
The original file can can be edited to specify a different fallback tool, but note that it will be overwritten if a new version of Unity is installed. There are several merge tools defined in this file (including P4Merge) and the first one that is found will be used. If it fails to resolve a conflict, it will launch a "fallback" tool specified in the file mergespecfile.txt located in the same folder as UnityYAMLMerge. When pulling or merging new changes results in a conflict, git mergetool can be run to attempt to automatically (better) resolve the conflicts in scenes or prefabs using UnityYAMLMerge. This can be done by modifying ~/.gitconfig (replacing the tool assignment from above): Ĭmd = 'C:/Program Files/Unity/Editor/Data/Tools/UnityYAMLMerge.exe' merge -p \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\" To configure UnityYAMLMerge requires adding a new "merge tool" entry and, to make it easier to use, setting Git's default merge tool to it. asset files being YAML, UnityYAMLMerge does not attempt to merge them as well (unless the force option is specified). Unity includes a tool ( UnityYAMLMerge) to assist in merging scene and prefab files. To set this up, simply add the following to your ~/.gitconfig file: Ĭmd = 'C:/Program Files/Perforce/p4merge.exe' \"$REMOTE\" \"$LOCAL\"Ĭmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\" I'm a fan of Perforce's P4merge for file diffs and interactive merges. There are several more user-specific settings that are worth reviewing later such as the default editor, diff and merge tools, command aliases, and more. It's also possible to override these settings per repository by removing the -global option from these commands and setting them once the repository is created. Git config -global user.email settings will be added to the per-user configuration file ~/.gitconfig which can be edited directly by running: git config -global -e To set a user name and email that will be used when committing changes: git config -global user.name "John Doe" Configuring Git User Settingsīefore creating or cloning a repository, it's worth configuring a few user-specific settings for Git.
LOCAL VS GLOBAL SPACE UNITY 2019 FULL
This makes merging changes possible and allows Git to store changes as smaller deltas instead of a full copy of the file to save storage space. The Asset Serialization setting ensures that Unity stores its asset files as text instead of binary. The command-line Git client will still find these files, but making them visible will ensure that other clients don't have issues finding them. meta files that Unity creates alongside all asset files and directories are not hidden on disk. The Version Control setting simply ensures that the. The following settings are the default in newer versions of Unity, but it's still worth a quick check to make sure they're configured correctly. There's a minimal amount of configuration required when using Git in a Unity project.
LOCAL VS GLOBAL SPACE UNITY 2019 WINDOWS
Note: I'll be using the Git command-line client (MinTTY) for Windows for the rest of the article.
This article covers initializing a new project using Git with Large File Storage (LFS) to handle the substantial number of binary files required by game development.
Using Git for version control in a Unity project requires a small amount of initial setup, but it can all be done quickly using the command-line client.
0 kommentar(er)
