WEBVTT

1
00:00:05.040 --> 00:00:07.839 A:middle L:90%
in this tutorial. I'm going to show you how

2
00:00:07.839 --> 00:00:12.429 A:middle L:90%
to use version control when you use Mac. And, John

3
00:00:12.429 --> 00:00:16.160 A:middle L:90%
was using the Git hub client but I am partial

4
00:00:16.160 --> 00:00:20.329 A:middle L:90%
to using source tree which is another Git hub client.

5
00:00:20.339 --> 00:00:22.870 A:middle L:90%
And um you can actually go to the Mac

6
00:00:22.870 --> 00:00:26.300 A:middle L:90%
store and down with it for free source tree.

7
00:00:26.940 --> 00:00:30.399 A:middle L:90%
See I already have it installed. So first download

8
00:00:30.399 --> 00:00:35.439 A:middle L:90%
that. Okay. And then we're gonna go to

9
00:00:35.450 --> 00:00:43.520 A:middle L:90%
our repo right here and the unity tutorials and we're

10
00:00:43.520 --> 00:00:48.299 A:middle L:90%
going to double click this and we are going to

11
00:00:48.310 --> 00:00:52.130 A:middle L:90%
go into source tree and we're gonna click Add New Repo

12
00:00:52.229 --> 00:00:55.140 A:middle L:90%
I'm gonna put that in there and then we all

13
00:00:55.140 --> 00:00:58.890 A:middle L:90%
want to put this on my desktop, desktop.

14
00:00:58.890 --> 00:01:03.140 A:middle L:90%
I'm gonna call this unity tutorial. Yeah.

15
00:01:03.640 --> 00:01:06.560 A:middle L:90%
Okay. And we're going to clone it.

16
00:01:10.840 --> 00:01:12.049 A:middle L:90%
So it's going to take a second to clone.

17
00:01:12.049 --> 00:01:14.650 A:middle L:90%
So I pause it and I'll come back in a second.

18
00:01:15.239 --> 00:01:18.010 A:middle L:90%
Okay? Once it's set up it's gonna look

19
00:01:18.010 --> 00:01:19.709 A:middle L:90%
like this, you're gonna have that as one of

20
00:01:19.709 --> 00:01:22.670 A:middle L:90%
your repos. And it's a good thing to note

21
00:01:22.680 --> 00:01:26.799 A:middle L:90%
that before I can do anything besides check out that

22
00:01:26.799 --> 00:01:29.900 A:middle L:90%
I need to be given access as a collaborator to

23
00:01:29.900 --> 00:01:32.439 A:middle L:90%
gets up, Git hub. So make sure whoever

24
00:01:32.439 --> 00:01:34.780 A:middle L:90%
creates the repo that they add you or else you

25
00:01:34.780 --> 00:01:38.159 A:middle L:90%
won't be able to push or commit to the Git

26
00:01:38.159 --> 00:01:42.560 A:middle L:90%
hub repo. So the next thing we want to

27
00:01:42.560 --> 00:01:53.489 A:middle L:90%
do is we want to start up Unity and right

28
00:01:53.489 --> 00:01:55.909 A:middle L:90%
now it's going to import all of the assets that

29
00:01:55.909 --> 00:01:59.859 A:middle L:90%
you just downloaded. Um Now it already knows that

30
00:01:59.859 --> 00:02:01.349 A:middle L:90%
I'm using this Unity tutorial folder, but if not

31
00:02:01.349 --> 00:02:04.510 A:middle L:90%
you would have to do open project. But

32
00:02:04.510 --> 00:02:06.810 A:middle L:90%
since I was just working with this before we started

33
00:02:06.810 --> 00:02:09.080 A:middle L:90%
the tutorial up, I'll be okay. And it's

34
00:02:09.080 --> 00:02:12.460 A:middle L:90%
just automatically going to import all of this stuff for

35
00:02:12.460 --> 00:02:16.439 A:middle L:90%
me. This might take a little more time so

36
00:02:16.439 --> 00:02:20.740 A:middle L:90%
I'll pause it and then I'll come back. Okay

37
00:02:20.750 --> 00:02:22.909 A:middle L:90%
So now you can see that we started up

38
00:02:22.909 --> 00:02:27.560 A:middle L:90%
Unity and we have all of the files that um

39
00:02:27.569 --> 00:02:29.530 A:middle L:90%
that came from the repo originally, and there's not

40
00:02:29.530 --> 00:02:30.789 A:middle L:90%
much to it. There's this third person camera.

41
00:02:30.800 --> 00:02:32.699 A:middle L:90%
I'm just going to show you how to do a

42
00:02:32.699 --> 00:02:36.930 A:middle L:90%
commit with changes. So if you want, Click

43
00:02:36.930 --> 00:02:38.939 A:middle L:90%
on this 3rd person camera, so I start up

44
00:02:38.939 --> 00:02:49.050 A:middle L:90%
MonoDevelopment. Okay? And once it does that,

45
00:02:50.639 --> 00:02:52.120 A:middle L:90%
it's going to go to the third person camera,

46
00:02:52.120 --> 00:02:53.449 A:middle L:90%
and I'm just going to do something really simple.

47
00:02:53.840 --> 00:02:59.849 A:middle L:90%
I'm just going to say test change. Uh

48
00:03:00.039 --> 00:03:05.500 A:middle L:90%
to commit Okay? Now we're gonna want

49
00:03:05.500 --> 00:03:07.870 A:middle L:90%
to save that and then we can minimize this and

50
00:03:07.870 --> 00:03:12.009 A:middle L:90%
Unity. And when you click on, you need

51
00:03:12.009 --> 00:03:15.560 A:middle L:90%
tutorials, it's gonna bring up our branches that we

52
00:03:15.560 --> 00:03:20.050 A:middle L:90%
have. And you're going to see that I've changed

53
00:03:20.060 --> 00:03:22.530 A:middle L:90%
this third person camera, You can see that over

54
00:03:22.530 --> 00:03:25.860 A:middle L:90%
here. Change to commit. And so now that

55
00:03:25.860 --> 00:03:28.710 A:middle L:90%
we have that and we can see this, what

56
00:03:28.710 --> 00:03:30.960 A:middle L:90%
we're going to do is we're going to want to

57
00:03:30.969 --> 00:03:43.030 A:middle L:90%
actually commit this. So initial initial Mac commit um

58
00:03:43.039 --> 00:03:50.659 A:middle L:90%
with change to the third person camera. Mhm.

59
00:03:51.240 --> 00:03:53.120 A:middle L:90%
Okay. Now you can see that we have this,

60
00:03:53.120 --> 00:03:57.270 A:middle L:90%
we're gonna hit select all and then we're going

61
00:03:57.270 --> 00:04:01.840 A:middle L:90%
to commit. Okay? So see okay, so

62
00:04:01.840 --> 00:04:03.629 A:middle L:90%
what that is a staged change and we're going to

63
00:04:03.629 --> 00:04:10.259 A:middle L:90%
change that to selected files. Okay. So that's

64
00:04:10.270 --> 00:04:12.699 A:middle L:90%
up to commit. Now we can see that it

65
00:04:12.699 --> 00:04:15.370 A:middle L:90%
says initial matt commit. But the last thing we're

66
00:04:15.370 --> 00:04:16.939 A:middle L:90%
going to have to do is actually push that change.

67
00:04:16.949 --> 00:04:19.350 A:middle L:90%
So we're going to push that to master.

68
00:04:19.740 --> 00:04:25.879 A:middle L:90%
And hit Okay. And now you can see

69
00:04:25.879 --> 00:04:28.699 A:middle L:90%
this is the up to date with this initial change.

70
00:04:28.709 --> 00:04:30.970 A:middle L:90%
And just to check things, just to show

71
00:04:30.970 --> 00:04:33.339 A:middle L:90%
you that it's changed. On that Unity tutorials,

72
00:04:33.350 --> 00:04:36.709 A:middle L:90%
click on it. You can see that just now

73
00:04:36.720 --> 00:04:39.839 A:middle L:90%
I have made initial change. You can go to

74
00:04:39.839 --> 00:04:44.459 A:middle L:90%
assets and then let me see just now, scripts

75
00:04:44.459 --> 00:04:48.449 A:middle L:90%
changed and we have this through third person camera and

76
00:04:48.449 --> 00:04:50.569 A:middle L:90%
we can see that it has the test change to

77
00:04:50.569 --> 00:04:53.769 A:middle L:90%
commit and that's really the basic.