mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 01:10:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Issue #109 Elaborate more on relative refs number 2 level

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

30
build/bundle.js
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",
"options": {
"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."
]
}
@ -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",
"options": {
"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."
]
}

1
build/bundle.min.21204f7a.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.f41aa7fd.js
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -445,7 +445,7 @@
For a much easier time perusing the source, see the individual files at:
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 downside? No raw logs to parse for analytics, so I have to include

15
src/levels/rampup/relativeRefs2.js
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",
"options": {
"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."
]
}