Skip to content

Chapter2 #2

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

Chapter2 #2

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
8bc0a79
My First Commit
groody Aug 23, 2016
9b61188
Hello Pepes
jasonma97 Aug 23, 2016
a671778
Hello World
groody Aug 23, 2016
29ff5c8
Merge branch 'master' of https://github.com/groody/GitAssignment
groody Aug 23, 2016
6bb6acc
Adding conflicts
jasonma97 Aug 23, 2016
156cdc0
Adding conflicts
groody Aug 23, 2016
5e148b3
Fixed conflicts
groody Aug 23, 2016
43027ee
Made changes to chapter 2
groody Aug 23, 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
5 changes: 5 additions & 0 deletions chapter 2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
I add new features in chapter 2. YAYAYAYA!
Did this cause any issues?

I did stuff

I hope I overwrote files here
2 changes: 2 additions & 0 deletions chatper 3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@

Is there a conflict here?
My text now goes here