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/2] 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 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 2/2] 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