Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update skills.yml #6

Merged
merged 1 commit into from
Feb 12, 2019
Merged

Update skills.yml #6

merged 1 commit into from
Feb 12, 2019

Conversation

jbouzak
Copy link
Owner

@jbouzak jbouzak commented Feb 12, 2019

I added 3 skills

@github-learning-lab github-learning-lab bot mentioned this pull request Feb 12, 2019
Copy link
Contributor

@github-learning-lab github-learning-lab bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Step 2: Merge the pull request

Great work, @jbouzak! You've created your first pull request successfully, and so far, there are no conflicts.

... but what actually is a pull request?

A pull request is a proposal to merge your changes with the code on the base branch, usually master.

Back to our visualization. When you opened your pull request, your Git 📖 history looked like this:

branch with commits image again

Your pull request simply indicates that you want to apply the history of your branch (in this case change-skills), into the master branch.

That merge might look something like this:

simple merge with master

⌨️ Activity: Merge the pull request

Protip: I have already approved this pull request, so if you still see "Review required" in the merge view, try refreshing the page.

  1. Click Merge pull request below
  2. Click Confirm merge
  3. Click Delete branch

Watch below for my response

@jbouzak jbouzak merged commit 2c63c7c into master Feb 12, 2019
@github-learning-lab
Copy link
Contributor

Nice job, @jbouzak, you've successfully merged your pull request!

Depending on the type of merge you selected, your history now looks something like this:

no ff merge

Notice a new commit has been added to master. This commit is called a merge commit and marks the point in time when your branch was merged into the master branch.


Go to the next pull request now!

@jbouzak jbouzak deleted the change-skills branch February 12, 2019 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant