From 720d63a044b4ee7c4912b4d61720d80540359357 Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Wed, 29 Apr 2020 00:01:14 +0530 Subject: [PATCH 1/7] Created the file --- log.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 log.txt diff --git a/log.txt b/log.txt new file mode 100644 index 0000000..ac25ed2 --- /dev/null +++ b/log.txt @@ -0,0 +1,10 @@ +Forking was done using the fork button in the given repository. + +$ git clone "URL of forked repo" +This command clones the contents of the given repository in my account. + +$ git checkout -b "branch-name" +Creates a new branch and moves into it + +$ vim log.txt +Opens the file in the editor From 2e85b9d99aceaa8046ec5991d4bb17e6c7e1d846 Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Wed, 29 Apr 2020 00:05:13 +0530 Subject: [PATCH 2/7] Changes made --- log.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/log.txt b/log.txt index ac25ed2..4d750d5 100644 --- a/log.txt +++ b/log.txt @@ -8,3 +8,6 @@ Creates a new branch and moves into it $ vim log.txt Opens the file in the editor + +$ git add "filename" +Adds the file to the branch From cefe949cc7787845a07c828885451f8b17ed8853 Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Wed, 29 Apr 2020 00:07:40 +0530 Subject: [PATCH 3/7] Answer added --- log.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/log.txt b/log.txt index ac25ed2..8a54d74 100644 --- a/log.txt +++ b/log.txt @@ -8,3 +8,5 @@ Creates a new branch and moves into it $ vim log.txt Opens the file in the editor + +ANSWER: EGG From 09fe58e957e6033907129e46dc9f6476e50b7dfe Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Wed, 29 Apr 2020 00:16:51 +0530 Subject: [PATCH 4/7] Added reason --- log.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/log.txt b/log.txt index 4d750d5..a86aef3 100644 --- a/log.txt +++ b/log.txt @@ -11,3 +11,6 @@ Opens the file in the editor $ git add "filename" Adds the file to the branch + +REASON: +The eggs in general (as in question), not "chicken eggs" existed long before chickens were developed. Egg laying animals existed way before chickens came about. With regards to chicken egg, a theory suggests that the present day chicken evolved from a primitive species gradually. So, the answer is egg technically. From bc381ff5c8cc67e7e1e9ca3c69865fe023bf73c7 Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Wed, 29 Apr 2020 00:28:33 +0530 Subject: [PATCH 5/7] File renamed --- log.txt => subramanian_log.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename log.txt => subramanian_log.txt (76%) diff --git a/log.txt b/subramanian_log.txt similarity index 76% rename from log.txt rename to subramanian_log.txt index bc444d2..a9c5de5 100644 --- a/log.txt +++ b/subramanian_log.txt @@ -4,14 +4,17 @@ $ git clone "URL of forked repo" This command clones the contents of the given repository in my account. $ git checkout -b "branch-name" -Creates a new branch and moves into it +Creates a new branch and moves into it. $ vim log.txt -Opens the file in the editor +Opens the file in the editor. <<<<<<< HEAD $ git add "filename" -Adds the file to the branch +Adds the file to the branch. + +$ git merge "branch-name" +Merges branch after resolving conflicts by adding and committing the file. <<<<<<< HEAD ======= ANSWER: EGG From 3c81bf1fc99e78fedfddbe0f228db785c970b7f3 Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Thu, 30 Apr 2020 16:31:13 +0530 Subject: [PATCH 6/7] Changes made --- subramanian_log.txt | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/subramanian_log.txt b/subramanian_log.txt index a9c5de5..e6283e6 100644 --- a/subramanian_log.txt +++ b/subramanian_log.txt @@ -9,18 +9,45 @@ Creates a new branch and moves into it. $ vim log.txt Opens the file in the editor. -<<<<<<< HEAD $ git add "filename" Adds the file to the branch. -$ git merge "branch-name" -Merges branch after resolving conflicts by adding and committing the file. -<<<<<<< HEAD -======= +$ git commit -m "message" +Commits the changes made. + +$ git status +Displays the state of the working directory. + +$ git checkout -b answer +Creates a new branch for answer and moves into it. + +...After entering the answer in the text file, add and commit the changes. + +$ git checkout "branch-name" +Moves to the first created branch. + +$ git checkout -b reason +Creates a new branch for reason and moves into it. + +...After entering the reason in the text file, add and commit the changes. + +$ git merge answer +Merges branch along with the text file after resolving conflicts by adding and committing the file. + +$ git merge reason +Merges branch along with the text file after resolving conflicts by adding and committing the file. + +..Manually remove the confict markers in the file. + +$ mv log.txt name_log.txt +Renames the file (exactly moves the contents to a newly named file) + +..Commit the changes + +$ git push -u origin branchname +Pushes the contents of the branch to the repo. + ANSWER: EGG ->>>>>>> answer -======= REASON: The eggs in general (as in question), not "chicken eggs" existed long before chickens were developed. Egg laying animals existed way before chickens came about. With regards to chicken egg, a theory suggests that the present day chicken evolved from a primitive species gradually. So, the answer is egg technically. ->>>>>>> reason From 1e5120b354b9694846ac0d42f159a119209dacf7 Mon Sep 17 00:00:00 2001 From: SUBRAMANIAN V V Date: Sat, 2 May 2020 14:03:08 +0530 Subject: [PATCH 7/7] Answer displayed in a new file --- subramanian_answer.txt | 4 ++++ subramanian_log.txt | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 subramanian_answer.txt diff --git a/subramanian_answer.txt b/subramanian_answer.txt new file mode 100644 index 0000000..eb13124 --- /dev/null +++ b/subramanian_answer.txt @@ -0,0 +1,4 @@ +ANSWER: EGG + +REASON: +The eggs in general (as in question), not "chicken eggs" existed long before chickens were developed. Egg laying animals existed way before chickens came about. With regards to chicken egg, a theory suggests that the present day chicken evolved from a primitive species gradually. So, the answer is egg technically. diff --git a/subramanian_log.txt b/subramanian_log.txt index e6283e6..6cd2306 100644 --- a/subramanian_log.txt +++ b/subramanian_log.txt @@ -45,9 +45,4 @@ Renames the file (exactly moves the contents to a newly named file) ..Commit the changes $ git push -u origin branchname -Pushes the contents of the branch to the repo. - -ANSWER: EGG - -REASON: -The eggs in general (as in question), not "chicken eggs" existed long before chickens were developed. Egg laying animals existed way before chickens came about. With regards to chicken egg, a theory suggests that the present day chicken evolved from a primitive species gradually. So, the answer is egg technically. +Pushes the contents of the branch to the repo.