Skip to content

Instantly share code, notes, and snippets.

@wdalmut
Last active December 30, 2015 21:39
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save wdalmut/7888444 to your computer and use it in GitHub Desktop.
Save wdalmut/7888444 to your computer and use it in GitHub Desktop.
learnGitBranching git exercises http://pcottle.github.io/learnGitBranching/?NODEMO `import level`
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\"},\"dev\":{\"target\":\"C3\",\"id\":\"dev\",\"remoteTrackingBranchID\":\"o/dev\"},\"o/master\":{\"target\":\"C4\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null},\"o/dev\":{\"target\":\"C3\",\"id\":\"o/dev\",\"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\":{\"1\":{\"target\":\"C4\",\"id\":\"1\"}},\"HEAD\":{\"target\":\"dev\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"dev\":{\"target\":\"C3\",\"id\":\"dev\",\"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\":\"dev\",\"id\":\"HEAD\"}}}",
"solutionCommand": "git commit ;git commit ;git checkout master;git merge dev --no-ff;git tag 1;git push;git checkout dev;git push",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\"},\"dev\":{\"target\":\"C1\",\"id\":\"dev\",\"remoteTrackingBranchID\":\"o/dev\"},\"o/master\":{\"target\":\"C1\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null},\"o/dev\":{\"target\":\"C1\",\"id\":\"o/dev\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"tags\":{},\"HEAD\":{\"target\":\"dev\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"dev\":{\"target\":\"C1\",\"id\":\"dev\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"tags\":{},\"HEAD\":{\"target\":\"dev\",\"id\":\"HEAD\"}}}",
"name": {
"en_US": "Simple Branching Model"
},
"hint": {
"en_US": ""
},
"startDialog": {
"en_US": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## A simple branch model!",
"",
"Just a simple branching model for simple projects",
"",
""
]
}
}
]
}
}
}
{
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C9\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\"},\"o/master\":{\"target\":\"C9\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null},\"dev\":{\"target\":\"C8\",\"id\":\"dev\",\"remoteTrackingBranchID\":\"o/dev\"},\"o/dev\":{\"target\":\"C8\",\"id\":\"o/dev\",\"remoteTrackingBranchID\":null},\"hotfix1\":{\"target\":\"C7\",\"id\":\"hotfix1\",\"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\"},\"C5\":{\"parents\":[\"C3\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C4\"],\"id\":\"C7\"},\"C8\":{\"parents\":[\"C6\",\"C7\"],\"id\":\"C8\"},\"C9\":{\"parents\":[\"C4\",\"C7\"],\"id\":\"C9\"}},\"tags\":{\"1\":{\"target\":\"C4\",\"id\":\"1\"},\"2\":{\"target\":\"C9\",\"id\":\"2\"}},\"HEAD\":{\"target\":\"dev\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C9\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"dev\":{\"target\":\"C8\",\"id\":\"dev\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C5\":{\"parents\":[\"C3\"],\"id\":\"C5\"},\"C4\":{\"parents\":[\"C1\",\"C3\"],\"id\":\"C4\"},\"C7\":{\"parents\":[\"C4\"],\"id\":\"C7\"},\"C9\":{\"parents\":[\"C4\",\"C7\"],\"id\":\"C9\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C8\":{\"parents\":[\"C6\",\"C7\"],\"id\":\"C8\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}}",
"solutionCommand": "git commit ;git checkout master;git branch hotfix1;git checkout hotfix1;git commit ;git checkout dev;git merge hotfix1 --no-ff;git checkout master;git merge hotfix1 --no-ff;git tag 2;git push;git checkout dev;git push",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\"},\"o/master\":{\"target\":\"C4\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null},\"dev\":{\"target\":\"C5\",\"id\":\"dev\",\"remoteTrackingBranchID\":\"o/dev\"},\"o/dev\":{\"target\":\"C5\",\"id\":\"o/dev\",\"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\"},\"C5\":{\"parents\":[\"C3\"],\"id\":\"C5\"}},\"tags\":{\"1\":{\"target\":\"C4\",\"id\":\"1\"}},\"HEAD\":{\"target\":\"dev\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"dev\":{\"target\":\"C5\",\"id\":\"dev\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C5\":{\"parents\":[\"C3\"],\"id\":\"C5\"},\"C4\":{\"parents\":[\"C1\",\"C3\"],\"id\":\"C4\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}}",
"name": {
"en_US": "Resolve production bugs"
},
"hint": {
"en_US": ""
},
"startDialog": {
"en_US": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Resolve a production bug!",
"",
"A new bug is revelated in your production environment.",
"",
"You have to fix your production! Add a commit into dev branch and fix the master branch",
"",
"GO GO GO!"
]
}
}
]
}
}
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment