From 5f78bbd281eb233e9b1192e06f7202a01c3ca2a6 Mon Sep 17 00:00:00 2001 From: shinigami2905 Date: Fri, 1 May 2020 10:50:52 +0530 Subject: [PATCH 1/4] log commit --- Aayush_log.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Aayush_log.txt diff --git a/Aayush_log.txt b/Aayush_log.txt new file mode 100644 index 0000000..fe6d037 --- /dev/null +++ b/Aayush_log.txt @@ -0,0 +1,7 @@ +a)git clone // for creating a clone +b)git checkout -b Aayush_Meshram //to create branch(-b for branch, checkout to change the current working branch) +c)git add //to add the text files +d)git commit -m "message" //to commit so the track can be kept +e)git merge //to merge branches +f)git pull // to get updates from master +g)git push origin [commit message] // push it to our remote repository \ No newline at end of file From 87da966c3f1325c5e7b671a2645cf07931aa5a82 Mon Sep 17 00:00:00 2001 From: shinigami2905 Date: Fri, 1 May 2020 10:54:10 +0530 Subject: [PATCH 2/4] the answer part added --- answer.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 answer.txt diff --git a/answer.txt b/answer.txt new file mode 100644 index 0000000..80f6cae --- /dev/null +++ b/answer.txt @@ -0,0 +1 @@ +Answer : Chicken \ No newline at end of file From fada2d617dd2d0cde23a82b2a540b26ba8983b0b Mon Sep 17 00:00:00 2001 From: shinigami2905 Date: Fri, 1 May 2020 10:58:06 +0530 Subject: [PATCH 3/4] explaination added --- answer.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 answer.txt diff --git a/answer.txt b/answer.txt new file mode 100644 index 0000000..40ff878 --- /dev/null +++ b/answer.txt @@ -0,0 +1 @@ +Reason : Since the chicken's egg is made up of an element which is exclusively made in chicken's ovaries and we are talking about chicken's egg and not a random egg. \ No newline at end of file From 5031f5f00a4d1ccde205d80473c224b7044f7b69 Mon Sep 17 00:00:00 2001 From: shinigami2905 Date: Fri, 1 May 2020 11:21:08 +0530 Subject: [PATCH 4/4] conflict are removed --- answer.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/answer.txt b/answer.txt index b917354..47602a2 100644 --- a/answer.txt +++ b/answer.txt @@ -1,5 +1,4 @@ -<<<<<<< HEAD + Answer : Chicken -======= + Reason : Since the chicken's egg is made up of an element which is exclusively made in chicken's ovaries and we are talking about chicken's egg and not a random egg. ->>>>>>> reason