Skip to content

Test Branch #17

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.

Sign up for GitHub

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

Open
rsdexter wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Test Branch #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7958f04
Add name to contributor list
rsdexter Sep 25, 2019
589354b
Resolve merge conflict
rsdexter Sep 25, 2019
541ed98
fixed a typo
rsdexter Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## git-tutorial

Contributors: Sidney Kochman, Hannah Lim, Andrew Qu, Grace Roller
Contributors: Sidney Kochman, Hannah Lim, Andrew Qu, Grace Roller, Robert Dexter

Thank you to [Daniele Procida](https://dont-be-afraid-to-commit.readthedocs.io/en/latest/git/commandlinegit.html) and [Nicola Paolucci](https://www.atlassian.com/git/articles/git-forks-and-upstreams) for their amazing Git resources!

Expand Down Expand Up @@ -214,7 +214,7 @@ Now, you can update the remote repository with these new changes:

Up to this point, you've made changes to the original code base and updated your remote repositiory with those changes. Now you want to contribute back to the original repo.

To do this you'll open a **pull request**. Pull requests basically just merge one bracnch into another. But, pull requests are often used so maintainers can make sure the code getting merged in works and is up to project standards. They're also a great way to get feedback on your code.
To do this you'll open a **pull request**. Pull requests basically just merge one branch into another. But, pull requests are often used so maintainers can make sure the code getting merged in works and is up to project standards. They're also a great way to get feedback on your code.

Go to your reposititory on GitHub. Click the **New pull request** button. Under the title **Open a pull request**, click the **compare across forks** option.

Expand Down