Skip to content

Dave giancaspro #29

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
dgiancaspro wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dave giancaspro #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26b9169
The Next POS
dgiancaspro Feb 17, 2016
e6f0726
Merge remote-tracking branch 'upstream/master' into dave_giancaspro
dgiancaspro Feb 17, 2016
6322180
Edited README.md
dgiancaspro Feb 17, 2016
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ up ssh keys which are worth a whole tutorial to themselves. Now that
you know what you are looking for. Copy it to the clipboard by
left-clicking the button. You clone it by typing:

git clone https@github.com:<your_github_username>/gitTutorial.git
git clone https://github.com:<your_github_username>/gitTutorial.git

Now you have your own copy of the repo both on your machine and in your github account.
If you want to work with the files in the `gitTutorial` directory, you should change into
Expand Down Expand Up @@ -358,7 +358,7 @@ You have now pulled the changes from my branch to your local machine
and onto your `firstName` branch. The next step is to merge it into
your `firstName` branch.

git merge upstream/firstName
git merge upstream/master firstname

You will want to save those to your github account as well. So to finish, type:

Expand All @@ -368,4 +368,4 @@ You will want to save those to your github account as well. So to finish, type:

If you refresh your github page you will see that the repository now
has two braches. Switch to the firstName branch and send a pull
request.
request.
Binary file added students/sect01/djt/trump_hair.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.