Last active
November 16, 2015 19:46
-
-
Save lkysow/de03cdeacd268e520e8c to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"hoot\":{\"target\":\"C3\",\"id\":\"hoot\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\",\"C3\"],\"id\":\"C4\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}", | |
"solutionCommand": "git checkout master;git merge hoot --no-ff", | |
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"hoot\":{\"target\":\"C3\",\"id\":\"hoot\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"}},\"tags\":{},\"HEAD\":{\"target\":\"hoot\",\"id\":\"HEAD\"}}", | |
"name": { | |
"en_US": "opposite of rewind" | |
}, | |
"hint": { | |
"en_US": "" | |
}, | |
"startDialog": { | |
"en_US": { | |
"childViews": [ | |
{ | |
"type": "ModalAlert", | |
"options": { | |
"markdowns": [ | |
"## Simulating a Pull Request", | |
"", | |
"You've just finished your `hoot` branch and you've submitted a pull request to `master`. What is git doing when you click \"merge pull request\"?", | |
"", | |
"This level is actually a special case because git doesn't need to create a merge commit to merge your branch into master because there were no commits between yours and the last one on master. However you always see a commit after merging a pull request: \"Merge pull request hoot into master\". How does github do this?", | |
"" | |
] | |
} | |
} | |
] | |
} | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment