Issue #109 Elaborate more on relative refs number 2 level

This commit is contained in:
Peter Cottle 2013-10-06 11:41:32 -07:00
parent b19a1e2bc5
commit 9e24c2dfa2
6 changed files with 48 additions and 3 deletions

View file

@ -21324,10 +21324,25 @@ require.define("/src/levels/rampup/relativeRefs2.js",function(require,module,exp
] ]
} }
}, },
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Let's see that previous command in action"
],
"afterMarkdowns": [
"There we go! Relative refs gave us a concise way to refer to `C1` and branch forcing (`-f`) gave us a way to quickly move a branch to that location"
],
"command": "git branch -f master HEAD~3",
"beforeCommand": "git commit; git commit; git commit; git checkout -b bugFix"
}
},
{ {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "markdowns": [
"Now that you have seen relative refs and branch forcing in combination, lets use them to solve the next level.",
"",
"To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown." "To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown."
] ]
} }
@ -40756,10 +40771,25 @@ require.define("/src/levels/rampup/relativeRefs2.js",function(require,module,exp
] ]
} }
}, },
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Let's see that previous command in action"
],
"afterMarkdowns": [
"There we go! Relative refs gave us a concise way to refer to `C1` and branch forcing (`-f`) gave us a way to quickly move a branch to that location"
],
"command": "git branch -f master HEAD~3",
"beforeCommand": "git commit; git commit; git commit; git checkout -b bugFix"
}
},
{ {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "markdowns": [
"Now that you have seen relative refs and branch forcing in combination, lets use them to solve the next level.",
"",
"To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown." "To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown."
] ]
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -445,7 +445,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.f41aa7fd.js"></script> <script src="build/bundle.min.21204f7a.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include

View file

@ -55,10 +55,25 @@ exports.level = {
] ]
} }
}, },
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Let's see that previous command in action"
],
"afterMarkdowns": [
"There we go! Relative refs gave us a concise way to refer to `C1` and branch forcing (`-f`) gave us a way to quickly move a branch to that location"
],
"command": "git branch -f master HEAD~3",
"beforeCommand": "git commit; git commit; git commit; git checkout -b bugFix"
}
},
{ {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "markdowns": [
"Now that you have seen relative refs and branch forcing in combination, lets use them to solve the next level.",
"",
"To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown." "To complete this level, move `HEAD`, `master`, and `bugFix` to their goal destinations shown."
] ]
} }