This article assumes that you are using Git for Windows but as long as you’re aware of which directories and path to change, this should give you an idea on how to proceed with Unity on Mac OS X and with the Linux beta.īefore setting everything up we should take a few minutes to look at the way git handles automatic merging through external tools. This entry on the official Unit圓D documentation explains how to set it up with Tortoise, however, like stated earlier, we are going to see how to set all that up with the more standard and official Git distrubution. Since Unity5 however, standard installations of Unit圓D come bundled with a handful of tools including one called UnityYAMLMerge, a tool made specifically to allow semi-automated merging of these complicated files. Before Unity5, this free tool did the job. Unit圓D scenes and prefabs use a specific file format (YAML) along with dynamically generated ID’s which makes automated merging pretty hard without a specific tool to do that. To keep track of the changes inside the scenes and prefabs, you also have to set the Asset Serialization mode to “Force Text” in the Editor Setting of the Unit圓D editor.įor most source files, scripts and shaders, when you don’t have too much conflicts, Git alone will work things out well enough, but for scenes and prefabs things get a bit more complicated. It’s usually just a matter of having a proper Unit圓D. If you aren’t doing that already this article won’t teach you the basics. You should probably be using some sort of version control for your Unit圓D projects, especially if you aspire to work in a professional context, I can’t stress that hard enough. It’s also a good opportunity to learn how to use Git in the case of complex merging situations since that’s the kind of thing that is bound to happen to you in production. With my distrust of GUI Git clients, I wanted to take some time to get some sort of automatic scene and prefab merging to work with my regular Git cli installation. To get going with a team, you’ll need both organisation and the proper tools to be as efficient as possible. Working with a revision control system and Unit圓D requires a bit more organisation than just making a working application. Automatic scene and prefab merging in Unit圓D with Git
0 kommentar(er)
