From 8bc0a7997a8f6771e0c15be48180c73b8fbbaa42 Mon Sep 17 00:00:00 2001 From: Groody Date: Tue, 23 Aug 2016 14:03:44 -0700 Subject: [PATCH 1/6] My First Commit --- chapter 2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/chapter 2.txt b/chapter 2.txt index 8b13789..6cb1207 100644 --- a/chapter 2.txt +++ b/chapter 2.txt @@ -1 +1,2 @@ +Insert text here From 9b611883ff6c2c7fc395b1d8b75695b2ccf1aeca Mon Sep 17 00:00:00 2001 From: Jason Ma Date: Tue, 23 Aug 2016 14:13:59 -0700 Subject: [PATCH 2/6] Hello Pepes --- chatper 3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatper 3.txt b/chatper 3.txt index 8b13789..4e5287f 100644 --- a/chatper 3.txt +++ b/chatper 3.txt @@ -1 +1 @@ - +Insert my text here From a671778bb74d7a516936a0d06783eb545af9b8c1 Mon Sep 17 00:00:00 2001 From: Groody Date: Tue, 23 Aug 2016 14:14:44 -0700 Subject: [PATCH 3/6] Hello World --- chapter 2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/chapter 2.txt b/chapter 2.txt index 6cb1207..01ae6d5 100644 --- a/chapter 2.txt +++ b/chapter 2.txt @@ -1,2 +1,3 @@ Insert text here +Rest of my Story here \ No newline at end of file From 6bb6acc3ccff74cf6d0abffc74973a34914c2ee6 Mon Sep 17 00:00:00 2001 From: Jason Ma Date: Tue, 23 Aug 2016 14:20:00 -0700 Subject: [PATCH 4/6] Adding conflicts --- chapter 2.txt | 3 ++- chatper 3.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chapter 2.txt b/chapter 2.txt index 6cb1207..76bec0b 100644 --- a/chapter 2.txt +++ b/chapter 2.txt @@ -1,2 +1,3 @@ -Insert text here +I did stuff +I hope I overwrote files here \ No newline at end of file diff --git a/chatper 3.txt b/chatper 3.txt index 4e5287f..d68dcb5 100644 --- a/chatper 3.txt +++ b/chatper 3.txt @@ -1 +1 @@ -Insert my text here +My text now goes here \ No newline at end of file From 156cdc04e08f4cfac3fd2f17bf64c17a8186ef9c Mon Sep 17 00:00:00 2001 From: Groody Date: Tue, 23 Aug 2016 14:20:38 -0700 Subject: [PATCH 5/6] Adding conflicts --- chapter 2.txt | 4 +--- chatper 3.txt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/chapter 2.txt b/chapter 2.txt index 01ae6d5..7b4febb 100644 --- a/chapter 2.txt +++ b/chapter 2.txt @@ -1,3 +1 @@ -Insert text here - -Rest of my Story here \ No newline at end of file +Did this cause any issues? \ No newline at end of file diff --git a/chatper 3.txt b/chatper 3.txt index 4e5287f..ad5059c 100644 --- a/chatper 3.txt +++ b/chatper 3.txt @@ -1 +1 @@ -Insert my text here +Is there a conflict here? \ No newline at end of file From 43027ee01a1a3723c6cf996353caa1b1b15ef1cd Mon Sep 17 00:00:00 2001 From: Groody Date: Tue, 23 Aug 2016 14:54:59 -0700 Subject: [PATCH 6/6] Made changes to chapter 2 --- chapter 2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter 2.txt b/chapter 2.txt index 5631c9a..861c8af 100644 --- a/chapter 2.txt +++ b/chapter 2.txt @@ -1,4 +1,4 @@ - +I add new features in chapter 2. YAYAYAYA! Did this cause any issues? I did stuff