From 3a9281876f602e284f0c8ccb2d29646dc55e6019 Mon Sep 17 00:00:00 2001 From: savar25 <41923689+savar25@users.noreply.github.com> Date: Thu, 30 Apr 2020 09:42:44 +0530 Subject: [PATCH 1/2] log added --- log.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 log.txt diff --git a/log.txt b/log.txt new file mode 100644 index 0000000..c777b78 --- /dev/null +++ b/log.txt @@ -0,0 +1,27 @@ +git clone //cloned file to local directory +cd //for moving into local directorygit +git checkout -b savar_shirbhate //new branch created and switched +touch log.txt //log.txt file created +/*File filled with inventory*/ + +git checkout -b answer //created a branch for the answer +touch savar_ans.txt //textfile for the answer +git add savar_ans.txt //adding file to git staged +git checkout -b explanation //created a branch for the explanation +echo "Explanation: +The egg came way before the chicken.The original chickens were formed from the mutation from the red jungle fowl where the +crossmating between the tro proto DNA species was responsible for the formation of an egg which over time gave rise to the domestic +chicken.">>answer.txt //for answer explanation +/* Add file details*/ +git add savar_ans.txt //adding file to git staged +git add log.txt //adding file to git staged +git commit -m "" //commiting the existant files +git checkout answer //moved to answer branch +git merge explanation// merged the branches +git branch -d explanation //deleted excess branch +git checkout savar_shirbhate //switch branches +mv log.txt savar_shirbhate.txt//renaiming file +git push origin master//push details to forked repo +git push origin answer +git push upstream master//push details to mentor repo +git push upstream answer From cd42ca2ca02b4c9f26a8708a552917bf337f14d4 Mon Sep 17 00:00:00 2001 From: savar25 <41923689+savar25@users.noreply.github.com> Date: Thu, 30 Apr 2020 09:51:11 +0530 Subject: [PATCH 2/2] log file renamed --- savar_shirbhate.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 savar_shirbhate.txt diff --git a/savar_shirbhate.txt b/savar_shirbhate.txt new file mode 100644 index 0000000..c777b78 --- /dev/null +++ b/savar_shirbhate.txt @@ -0,0 +1,27 @@ +git clone //cloned file to local directory +cd //for moving into local directorygit +git checkout -b savar_shirbhate //new branch created and switched +touch log.txt //log.txt file created +/*File filled with inventory*/ + +git checkout -b answer //created a branch for the answer +touch savar_ans.txt //textfile for the answer +git add savar_ans.txt //adding file to git staged +git checkout -b explanation //created a branch for the explanation +echo "Explanation: +The egg came way before the chicken.The original chickens were formed from the mutation from the red jungle fowl where the +crossmating between the tro proto DNA species was responsible for the formation of an egg which over time gave rise to the domestic +chicken.">>answer.txt //for answer explanation +/* Add file details*/ +git add savar_ans.txt //adding file to git staged +git add log.txt //adding file to git staged +git commit -m "" //commiting the existant files +git checkout answer //moved to answer branch +git merge explanation// merged the branches +git branch -d explanation //deleted excess branch +git checkout savar_shirbhate //switch branches +mv log.txt savar_shirbhate.txt//renaiming file +git push origin master//push details to forked repo +git push origin answer +git push upstream master//push details to mentor repo +git push upstream answer