From e7b5c67ba25e994f4d044f166cfae9b423b9d011 Mon Sep 17 00:00:00 2001 From: sktoiva Date: Thu, 18 Oct 2018 14:12:53 +0300 Subject: [PATCH 1/2] Return index to original state --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2b3d65e..0cd03eb 100644 --- a/index.html +++ b/index.html @@ -39,7 +39,7 @@

Welcome to interactive Git and GitHub tutorial

-

This is how you branch like a rockstar!

+

From 59900ea557cb7af2e0bc46dcbb135c082be39395 Mon Sep 17 00:00:00 2001 From: sktoiva Date: Thu, 18 Oct 2018 14:13:18 +0300 Subject: [PATCH 2/2] Fix classes in README. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ba5033f..be906d2 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ Congrats! You created a branch. `git status` shows you that you are currently in Let's make a change to `index.html`. You can see that there's an empty paragraph with class `description`. Add a description, so that the result is: ``` -

This is how you branch like a rockstar!

+

This is how you branch like a rockstar!

``` Next, save the file and use `git add`, `git commit` and `git push` to save and push your changes. @@ -160,7 +160,7 @@ git checkout -b edit-description Go and edit the `index.html` file, so that the description block looks like following: ```html -

This is how you rebase like a rockstar!

+

This is how you rebase like a rockstar!

``` When your ready, save the file and push the changes to Github. @@ -271,7 +271,7 @@ git checkout -b resolve-like-rockstar Edit the `index.html` file, so that the description is following: ```html -

This is how you resolve conflicts like a rockstar!

+

This is how you resolve conflicts like a rockstar!

``` When your ready, push the changes to Github. @@ -342,7 +342,7 @@ Open the `index.html` file in your editor and you will see this: Edit the file so that it include both changes and remove lines starting with `<<<<<<<`, `=======` and `>>>>>>>` so that the end result is: ```html -

This is how you rebase and resolve conflicts like a rockstar!

+

This is how you rebase and resolve conflicts like a rockstar!

``` Save the file. Now that you've resolved the conflict, you have to mark the file as resolved. Do it with `git add`: