It merged the two together adding the second planet at the end.
Screenshot of Wikipedia Switcheroo
When I am in the mars branch, it shows just the marks wiki paragraph. When I switch the the saturn, the readme shows the saturn.
I created the branch
git show master shows the info on Saturn.
git show add-neptune shows the info on Saturn removed, and the info on Neptune added.
Sorry about the fading of the terminal. I use a HUD terminal, and it’s difficult to get a good screenshot before it disappears.
Having two branches, namely
feature/kepler-62f, and since I have committed the changes I did in readme.md on branch
feature/kepler-62f, I can inspect the changes using
git diff master..feature/kepler-62f. The output is:
diff --git a/readme.md b/readme.md index 5b7863b..0b2e523 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,11 @@ -# Kepler 22b +# Various planets + +## Kepler 22b Kepler-22b, also known by its Kepler object of interest designation KOI-087.01, is an extrasolar planet orbiting within the empirical habitable zone of the Sun-like star Kepler-22. It is located about 638 light-years (196 pc) from Earth in the constellation of Cygnus. It was discovered by NASA's Kepler Space Telescope in December 2011 and was the first known transiting planet to orbit within the habitable zone of a Sun-like star. Kepler-22 is too dim to be seen with the naked eye. + +## Kepler 62f + +Kepler-62f (also known by its Kepler Object of Interest designation KOI-701.04) is a super-Earth exoplanet orbiting within the habitable zone of the star Kepler-62, the outermost of five such planets discovered around the star by NASA's Kepler spacecraft. It is located about 990 light-years (304 parsecs) from Earth in the constellation of Lyra. + +
The new branch (venus in my case) readme.md has both paragraphs, since we branched off master.
In the master branch the readme.md still contains one paragraph (Mercury in my case).
git merge venus will bring the changes to master and readme.md will have both paragraphs.
If I was in the master only one of the paragraphs is in the read me.
In master, the readme.md shows my first planet but in the new branch it shows the second planet, because I’ve overwritten the original post.
But if I append the information of the second planet to the original, the new branch shows information about both planets and master branch only shows the first planet. If we want both to have the same content we must do a merge in the master brach with the new branch.
Here is my submission.
When in my Jupiter branch, only the Jupiter paragraph displays since i replaced the text in the file.
First I added the information about Jupiter, then information about Saturn.
The file shows the latest update in the readme.md from the new branch we created because we are currently in that new branch. here are my screenshots.
I have placed merge exercise screen shot for your reference
Here is the screenshot of my output.
I see both paragraphs, the first one is of Saturn from the first commit on the master branch, the second one, of Jupiter, on the second commit on the second_branch