From 117f55da40194e40a64b7ded5b281d1353cd08ea Mon Sep 17 00:00:00 2001
From: Ayush Shukla <34869001+Aayush-Shukla@users.noreply.github.com>
Date: Wed, 29 Apr 2020 00:35:39 +0530
Subject: [PATCH 1/6] log

---
 log.txt | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 log.txt

diff --git a/log.txt b/log.txt
new file mode 100644
index 0000000..51a8fd0
--- /dev/null
+++ b/log.txt
@@ -0,0 +1,37 @@
+git clone https://github.com/Aayush-Shukla/github_task0.git   #to copy the gut repo to the local machine
+
+git checkout -b ayush_shukla    # creating a branch and switching to that branch
+
+git add .   # adding the change in the working area after creating log.txt
+
+git commit -m "log"    # saving changes to the local repo
+
+git checkout master   #changing branch
+
+git checkout-b b1    # creating a branch and switching to that branch
+
+git add .    # adding the change in the working area after creating task.txt with answer in it
+
+git commit -m "answer"
+
+git checkout master   #changing branch
+
+git checkout -b b2    # creating a branch and switching to that branch
+
+git add .    # adding the change in the working area after creating task.txt with answer in it
+
+git commit-m "explanation"    # saving changes to the local repo
+
+git checkout b1    # creating a branch and switching to that branch
+
+git merge b2    # merging b1 and b2 which shows merge conflicts
+
+git add .    # adding the change in the working area after *solving merge conflicts*
+
+git commit -m "resolved merge conflict"    # saving changes to the local repo
+
+git push origin master    #upload local repository content to a remote repository
+
+git push origin b1    #upload local repository content to a remote repository
+
+git push origin b2    #upload local repository content to a remote repository
\ No newline at end of file

From 638a7086940f63127caf43a53d320e08b62d6643 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <34869001+Aayush-Shukla@users.noreply.github.com>
Date: Wed, 29 Apr 2020 00:36:40 +0530
Subject: [PATCH 2/6] answer

---
 task.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 task.txt

diff --git a/task.txt b/task.txt
new file mode 100644
index 0000000..9d464a4
--- /dev/null
+++ b/task.txt
@@ -0,0 +1 @@
+egg

From 8c67e7c1ae8c9fa05f73cbc9c89465d836fc3fd4 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <34869001+Aayush-Shukla@users.noreply.github.com>
Date: Wed, 29 Apr 2020 00:37:36 +0530
Subject: [PATCH 3/6] explanation

---
 task.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 task.txt

diff --git a/task.txt b/task.txt
new file mode 100644
index 0000000..f5d8316
--- /dev/null
+++ b/task.txt
@@ -0,0 +1,5 @@
+During the evolution of chicken, the creature that was infinitesimally close to chicken gave birth to an egg which after fertilizing had th final mutations in a hereditary from necessary to finally be a chicken.
+
+Therefore I believe that the first complete chicken would have had to hatch from that egg.
+
+

From 4c0235f295310a8e161ac88d2fcb754831fc239f Mon Sep 17 00:00:00 2001
From: Ayush Shukla <34869001+Aayush-Shukla@users.noreply.github.com>
Date: Wed, 29 Apr 2020 00:48:41 +0530
Subject: [PATCH 4/6] renamed log.txt

---
 log.txt => ayush_shukla.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename log.txt => ayush_shukla.txt (100%)

diff --git a/log.txt b/ayush_shukla.txt
similarity index 100%
rename from log.txt
rename to ayush_shukla.txt

From 61acf6e7f5791c64c2fd9eaaddf0bb25651b08af Mon Sep 17 00:00:00 2001
From: Ayush Shukla <34869001+Aayush-Shukla@users.noreply.github.com>
Date: Thu, 30 Apr 2020 13:52:16 +0530
Subject: [PATCH 5/6] deleted task.txt

---
 task.txt | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 task.txt

diff --git a/task.txt b/task.txt
deleted file mode 100644
index 576605a..0000000
--- a/task.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-egg
-
-During the evolution of chicken, the creature that was infinitesimally close to chicken gave birth to an egg which after fertilizing had th final mutations in a hereditary from necessary to finally be a chicken.
-
-Therefore I believe that the first complete chicken would have had to hatch from that egg.
-
-
-

From 4a47d0d0a87db1ad43107b8229f2909fd21ef2d3 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <34869001+Aayush-Shukla@users.noreply.github.com>
Date: Thu, 30 Apr 2020 13:53:40 +0530
Subject: [PATCH 6/6] renamed log.txt

---
 ayush_shukla.txt => ayush_log.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ayush_shukla.txt => ayush_log.txt (100%)

diff --git a/ayush_shukla.txt b/ayush_log.txt
similarity index 100%
rename from ayush_shukla.txt
rename to ayush_log.txt