Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Midhuram Manoj #16

Merged
merged 5 commits into from
May 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions midhuram_manoj.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
Commands Used

1. git clone https://github.com/Midhu7/SOPTask0.git
To clone the forked repo in my account to local system

2. git checkout -b midhuram_manoj
To create and shift to branch midhuram_manoj

3. touch log.txt
To create a new file log.txt and then write all commands used

4. git add .
git commit -m "message"
To commit all changes made

5. git checkout -b answer-oneword
To create new branch
Write one word answer in log.txt

6. git add .
git commit -m "message"
To commit all changes made

7. git checkout midhuram_manoj
To shift to branch midhuram_manoj

8. git checkout -b answer-explanation
To create new branch
Write explanation in log.txt

9. git add .
git commit -m "message"
To commit all changes made

10.git checkout midhuram_manoj
To shift to branch midhuram_manoj

11.git merge answer-oneword
To merge branch to midhuram_manoj

12.git merge answer-explanation
To merge branch to midhuram_manoj

13.Resolve conflicts
add .
git commit
To save the merge commit

14.mv log.txt midhuram_manoj.txt
To rename file log.txt

15.git add .
git commit -m "message"
To commit all changes made

16.git pull origin master
To pull updates from remote file

17.git add .
git commit -m "added file midhuram_manoj"
To add and commit all changes made

18.git push origin midhuram_manoj
To add the new branch to the forked repo

19.Go back to original repository and create pull request
4 changes: 4 additions & 0 deletions midhuram_manoj_answer.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Egg

Basically, many, many moons ago there was a chicken-like bird. It was genetically close to a chicken but wasn't a full-blown chicken yet. The video calls it a proto-chicken. So proto-hen laid an egg, and proto-rooster fertilized it. But when the genes from ma and pa almost-chicken fused, they combined in a new way, creating a mutation that accidentally made the baby different from its parents. Although it would take millennia for the difference to be noticed, that egg was different enough to become the official progenitor of a new species, now known as... the chicken! So in a nutshell (or an eggshell, if you like), two birds that weren't really chickens created a chicken egg, and hence, we have an answer: The egg came first, and then it hatched a chicken.