From the course: Unity: Cloud Build with Git

Unlock the full course today

Join today to access over 22,600 courses taught by industry experts or purchase this course individually.

Merge changes

Merge changes - Unity Tutorial

From the course: Unity: Cloud Build with Git

Start my 1-month free trial

Merge changes

- Now that we have all the changes saved, it's time for us to quit Unity. The reason we're going to quit Unity is because we're going to save all the changes in Git and merge them back into the master trunk. Whenever we do a merge like this, we're going to be moving files around inside of the Unity project. If you have Unity open while this is happening, things may get corrupted or Unity may crash. Now let's take a look at the files that have been changed. Here we'll type in git status. And you'll see we now have some new modified files and we have files that didn't exist before. Let's go ahead and commit these changes. First, we'll need to track all the changes by using git add -- all. Now, if we do git status, everything should be in green. Next, we're going to want to save these changes by committing them. Let's type in git commit - m and in quotes, we'll say "upgrade unity project to v5.3.4 "and added default scene." Now all these files have been saved and if we do git status…

Contents