From 56cb3c99fa612ca189c82c9f37ba9c320ab9a2f1 Mon Sep 17 00:00:00 2001 From: Almir Kadric Date: Tue, 9 Sep 2014 19:09:19 +0900 Subject: [PATCH 1/2] Conflicting commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e9c25b..a2c50bd 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Lastly we initiate a pull request to the origin blessed repository using the `Pu First Conflict -------------- Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following -sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` +sentence `She sells sea-shells at the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` as opposed to `on the sea-shore`. ### Branch From e7f87f54ac3e76e96158b846692d13de162958f1 Mon Sep 17 00:00:00 2001 From: asp-hikaru Date: Wed, 8 Feb 2017 16:25:04 +0900 Subject: [PATCH 2/2] First Conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78871dd..e217aa3 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Lastly we initiate a pull request to the origin blessed repository using the `Pu First Conflict -------------- Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following -sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` +sentence `She sells sea-shells on the seashore.`. What we will do is modify this sentence to contain `by the seashore` as opposed to `on the sea-shore`. #### Branch