Making a Pull Request Udacity English (auto-generated) English

Making a Pull RequestYouTube↗ IA↗(long shot)
Education 13.3K views 13 likes 3 dislikes 03 Dec 2014

Udacity 7.7K subscribers N/A YouTube↗

Click to Play Video

now that you've seen how to make changes public by sharing them on github I

Now that you've seen how to make changes public by sharing them on GitHub,

wanted to show you a workflow you can use to get feedback on your changes to a

I wanted to show you a work flow you can use to get feedback on your changes to

project before you update the master

a project before you update the master branch.

branch as an example here's the recipes repository both locally on my own

As an example, here is the recipes repository both locally on my own

computer and on my fork on github if I

computer and my fork on GitHub.

have a change I want Sara's feedback on

If I have a change I want Sarah's feedback on,

then first I'll make that change locally in a separate branch next I'll push that

then first I'll make that change locally on a separate branch.

change to my fork now my change is

Next, I'll push that change to my fork.

shared on github so Sara can see it but

Now my change is shared on GitHub, so

it's not in the master branch

Sarah can see it, but it's not in the master branch.

that way if Sara finds a problem with my

That way if Sarah finds a problem with my change when she reviews it,

change when she reviews it I won't have broken master next I'll use the feature

I won't have broken master.

of github called pull requests that make

Next, I'll use a feature of GitHub called pull requests that make it

it easy for Sara to see exactly what I've changed and leave comments when

easy for Sarah to see exactly what I've changed and leave comments.

we're both ready I'll merge this change into the master branch right now I want

When we're both ready, I'll merge this change into the master branch.

to change the cake recipe to use canola

Right now, I want to change the cake recipe to use canola oil instead of

oil instead of vegetable oil since it's

vegetable oil, since it's healthier.

healthier first I'll make a new branch called different oil then I'll check out

First, I'll make a new branch called different-oil.

that branch and I'll go ahead and make

Then I'll check out that branch, and I'll go ahead and make the change.

the change now I want to show Sara the

Now, I want to show Sarah the changes I've made, so

changes I've made so I'll add them commit them and push them note that this

I'll add them, commit them, and push them.

time I'm running git push origin different oil to push the different oil

Note that this time I'm running git push origin different-oil to

branch instead of master now that I've

push the different-oil branch instead of master.

pushed my branch it's possible to see it

Now that I've pushed my branch, it's possible to see it on GitHub.

on github to see what branches exist I can choose this drop down and I can see

To see what branches exist, I can choose this drop down, and

that right now I'm looking at the master

I can see that right now I'm looking at the master branch.

branch and here's the different oil branch that I just pushed this list of

And here's the different-oil branch that I just pushed.

branches is the same list I would see if

This list of branches is the same list I would see if I ran get branch on

I ran git branch on the repository on

the repository on GitHub.

github so only branches that I've pushed to get hub will show up to see what the

So only branches that I've pushed to GitHub will show up.

files look like on the different oil branch I can click on it which is

To see what the files look like on the different-oil branch, I can click on it,

analogous to running git checkout Sara

which analogous to running git checkout.

could also do this and then view the

Sarah could also do this and

commit history to see what changes I've

then view the commit history to see what changes I've made.

made instead though I'm going to create a pull request for my changes I'll go

Instead though I'm going to create a pull request for my changes.

back to the main page for the repository and I could click the compare and pull

I'll go back to the main page for the repository, and I could click

request button here since I just pushed the branch recently but if I'd pushed it

the compare and pull request button here since I just pushed the branch recently.

less recently and that button wasn't

But if I'd pushed it less recently and that button wasn't there, then I

there then I would check out this branch scroll down a little and click pull

would check out this branch, scroll down a little and click Pull Request.

request by default github assumes I want

By default, GitHub assumes I want to merge my changes into

to merge my changes into the original repository which slurries repository but instead I want

the original repository, which is Larry's repository.

to merge my changes into the master branch of my own Fork so I'll scroll to

But instead, I want to merge my changes into the master branch of my own fork.

the right and click Edit and now I can

So I'll scroll to right and click Edit.

change the base fork to see Bucky - UDA

And now I can change the base fork to cbuckey-uda/recipes.

/ recipes now I'll scroll down into the right and click create pull request now

Now I'll scroll down and to the right, and click Create pull request.

github makes a view that shows all of

Now, GitHub makes a view that shows all of the commits that are present in

the commits that are present in this pull request and all of the changes that

this pull request and all of the changes that have been made.

have been made if I go back up to the

If I go back up to the repository and

repository and scroll to the right I can also see a list of all pull requests so

scroll to the right, I can also see a list of all Pull Requests.

Sara can check this list and see that

So, Sarah can check this list and

I'd like to merge these changes into

see that I'd like to merge these changes into master.

master now I'll turn you over to Sara while she looks at my pull request since

Now, I'll turn you over to Sarah while she looks at my pull request.

I'm watching Caroline's Fork of the recipes repository I got an email

>> Since I'm watching Caroline's fork of the recipes repository,

notifying me when she made a pull

I got an email notifying me when she made a pull request.

request I can click through in this email to see the pull request on github

I can click through in this email to see the pull request on GitHub.

you might be wondering why these are called pull requests Carolina initiated

You might be wondering why these are called pull requests.

this request but she's not asking to

Caroline initiated this request, but she's not asking to pull anything.

pull anything she's trying to merge one of her changes into master or you might

She's trying to merge one of her changes into master, or

think of this as her trying to push into

you might think of this as her trying to push into master.

master so why is it called a pull

So why is it called a pull request?

request it's because she's requesting that I pull her branch into the master

It's because she's requesting that I pull her branch into the master branch.

branch another good name for this might be a merge request but pull requests is

Another good name for this might be a merge request.

what github picked so we'll go with that

But, pull request is what GitHub picked, so we'll go with that.

so Caroline wants me to merge her different oil branch into the master

So Caroline wants me to merge her different-oil branch into

branch since the master branch is the

the master branch.

main branch and it's what people will

Since the master branch is the main branch, and

see when they first come to the

it's what people will see when they first come to the repository,

repository I want to make sure that it really looks good before actually doing the merge all right it looks like she

I want to make sure that it really looks good before actually doing the merge.

just changed vegetable - OH canola

All right. It looks like she just changed vegetable to, oh, canols?

I think she meant canola based on the name of the pull request I don't really

I think she meant canola, based on the name of the pull request.

want to merge this in because it has a

I don't really want to merge this in because it has a spelling error.

spelling error that would probably be confusing if anybody was looking at this

That would probably be confusing if anybody was looking at this later.

later so instead of merging it now I'm actually gonna leave a comment I could

So instead of merging it now, I'm actually going to leave a comment.

put my comment here

I could put my comment here,

commenting on the whole change or I

commenting on the whole change, or I could do an inline comment here.

could do an inline comment here I think I'll choose that option

I think I'll choose that option.

at this point I'll go back to the main

At this point, I'll go back to the main pull request.

pull request if there were more commits I could look at them here but since

If there were more commits, I could look at them here, but

there's only one I don't need to look at

since there's only one, I don't need to look at anything else.

anything else if I had decided that the change was good and ready to be pulled

If I had decided that the change was good, and ready to be pulled in

in right now I could have pressed this merge pull request button this will only

right now, I could have pressed this Merge pull request button.

appear when the merge could go through

This will only appear when the merge could go through without a conflict.

without a conflict so it's a nice indicator to the person reviewing the

So it's a nice indicator to the person reviewing the changes, as to whether or

changes as to whether or not it's really ready to go if the change would have

not it's really ready to go.

created a merge conflict

If the change would have created a merge conflict, I would ask Caroline to merge

I would ask Caroline to merge master into her branch first so that I could see how she resolves the conflict that

master into her branch first, so that I could see how she resolves the conflict.

way I know that when her code finally does get added to master there's no

That way I know that when her code finally does get added to master,

chance that something's gonna go wrong with a bad merge all right at this point

there's no chance that something's going to go wrong with a bad merge.

you should go ahead and make the change

All right, at this point you should go ahead and

the Caroline described by creating a new branch off of master and committing a

make the change that Caroline described by creating a new branch off of master,

change switches vegetable-oil out in favor of canola you can make a typo or

and committing a change that switches vegetable oil out in favor of canola.

other mistake on purpose so that you'll

You can make a typo or other mistake on purpose so

have a reason to update the pull request

that you'll have a reason to update the pull request later.

later you don't have to go ahead and

You don't have to.

push your new branch to the fork and

Go ahead and push your new branch to the fork, and then use GitHub to

then use github to initiate a pull request but make sure not to click the merge button yet

initiate a pull request, but make sure not to click the Merge button yet

Similar videos:

Conflicting Changes
Udacity
1.2K views 5 likes 4 dislikes 23 Feb 201532% match

Settings Privacy About Contact Donate