Skip to content

Please Take mY code! #1

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

Please Take mY code! #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6574441
Added my username to the hello.txt
khaume Oct 9, 2012
626229f
Added name on the file
Atcold Oct 9, 2012
f15bb52
added sig
howardcheung Oct 9, 2012
e9553a7
Resolved merge confilict in hello
scopatz Oct 9, 2012
87eb6b7
Resolved merge conflict in hello.txt
Atcold Oct 9, 2012
18bf792
Resolved merging. Now has both Scopatz and khaume in hello.txt
khaume Oct 9, 2012
94b93b2
Merge pull request #2 from Atcold/master
scopatz Oct 9, 2012
00d9007
pulling in changes
scopatz Oct 9, 2012
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
2 changes: 1 addition & 1 deletion 3b-VersionControlRemote/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Step 2 : Make certain you are in the master branch and merge the
upstreeam master branch into your master branch

$ git checkout master
$ git merge upstream\master
$ git merge upstream/master

Step 3 : Check out what happened by browsing the directory.

Expand Down
4 changes: 4 additions & 0 deletions hello.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
Hi Friends!!!

Alfredo
I am khaume
scopatz ;)
!!