search

msorre2 / merge-conflict

https://lab.github.com/githubtraining/managing-merge-conflicts
MIT License
0 stars 0 forks source link

Update skills.yml #6

Closed msorre2 closed 5 years ago

msorre2 commented 5 years ago

Update skills and descriptions

teacherbot[bot] commented 5 years ago

:wave: hiya Please remember to delete your branch after merging or closing if you haven't done so already.

github-learning-lab[bot] commented 5 years ago

Nice job, @msorre2, 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!