1
00:00:00,690 --> 00:00:05,360
In class section we created a new pull request to merge code from our feature branch into the master

2
00:00:05,360 --> 00:00:06,100
branch.

3
00:00:06,230 --> 00:00:12,230
As soon as we created that play request travesty I kicked in gear and ran some tests over our codebase.

4
00:00:12,290 --> 00:00:15,950
You'll notice that there were actually two sets of checks that were issued.

5
00:00:15,950 --> 00:00:22,220
The first check was the fact that we just pushed some code up to up to get up the second check kind

6
00:00:22,220 --> 00:00:26,590
of fate merging our code into the master branch and then running the tests.

7
00:00:26,750 --> 00:00:32,300
So one test or one set of tests right here was to say hey the code was pushed by itself is valid and

8
00:00:32,360 --> 00:00:35,770
the code that was pushed merge to master is valid as well.

9
00:00:36,080 --> 00:00:41,480
So now that both of our checks have succeeded we can merge the pull request as soon as we merge this

10
00:00:41,480 --> 00:00:42,670
pull request.

11
00:00:42,680 --> 00:00:45,380
Travis he's going to kick in to here again.

12
00:00:45,410 --> 00:00:47,760
It's going to run our tests a third time.

13
00:00:47,840 --> 00:00:52,670
And then after it because it is a change that was issued to the master branch it's going to automatically

14
00:00:52,670 --> 00:00:57,190
attempt to deploy our application again over to elastic beanstalk.

15
00:00:57,230 --> 00:01:04,730
So in theory someone might say like your code looks good so maybe that's some other engineer I would

16
00:01:04,730 --> 00:01:06,590
see that I'd say ok cool.

17
00:01:06,590 --> 00:01:12,070
Time to merge so I'd merge the puller request confirmed the merge that merges the code.

18
00:01:12,320 --> 00:01:16,420
We now have all of our changes safely merge into the master branch.

19
00:01:16,580 --> 00:01:21,860
So now we can go back over to Travis see-I after a second or two will see a new build appear over here

20
00:01:22,310 --> 00:01:25,630
I'll try refreshing just to get it to pop up a second sooner.

21
00:01:26,800 --> 00:01:27,170
Come on.

22
00:01:27,190 --> 00:01:28,020
Come on.

23
00:01:28,110 --> 00:01:29,790
Any second now.

24
00:01:30,350 --> 00:01:34,800
I'm not going to make you wait too long but eventually the build is going to kick off because we made

25
00:01:34,800 --> 00:01:40,680
a change the master branch and then because it's changed to master Travis is going to deploy back over

26
00:01:40,680 --> 00:01:42,750
to elastic beanstalk afterwards.

27
00:01:42,750 --> 00:01:44,510
So we'll take another quick break right here.

28
00:01:44,520 --> 00:01:49,160
I'm going to let the build run again and I'm going to let the deploy run again as well.

29
00:01:49,280 --> 00:01:50,750
Oh and there's the build right there.

30
00:01:50,910 --> 00:01:55,350
So I'll let both the bills run and the redeployed run and they will join back up in the next section

31
00:01:55,560 --> 00:01:58,470
and just verify that everything got deployed successfully.

32
00:01:58,470 --> 00:02:01,270
So quick break and I'll see you in a minute.