Module 2 Exercise 3: Wikipedia Switcheroo


(eChris) #243

This is quite interesting as the first branch (master) retains the actual content but creating another branch provides extra information not available on the first branch. This is so cool


(Asaolu Elijah) #244

Capture4


(Kundan) #245

It merged the two together adding the second planet at the end.


(Mayur Patil (मयूर पाटील)) #246

Screenshot of Wikipedia Switcheroo


(BJ Selby) #247

3%20screenshot%201 3%20screenshot%202

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.


(Ryan B. Harvey) #248

I created the branch add-neptune.

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.




(Pantelis Sopasakis) #249

Having two branches, namely master and 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[1][2][4] (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.
+
+

(Federico Bassetti) #250


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).
From master git merge venus will bring the changes to master and readme.md will have both paragraphs.


(Cristianjacob1) #251