mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-10 14:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves #297 combine dialogs

Browse source
This commit is contained in:
Peter Cottle 2015-06-24 09:49:33 -07:00
parent e71a89e450
commit 088480df05
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/levels/mixed/jugglingCommits.js
View file

@ -67,14 +67,7 @@ exports.level = {
"* Then we will re-order the commits back to how they were previously with `git rebase -i`", "* Then we will re-order the commits back to how they were previously with `git rebase -i`",
"* Finally, we will move master to this updated part of the tree to finish the level (via the method of your choosing)", "* Finally, we will move master to this updated part of the tree to finish the level (via the method of your choosing)",
"", "",
"There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique." "There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique.",
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree ", "Lastly, pay attention to the goal state here -- since we move the commits twice, they both get an apostrophe appended. One more apostrophe is added for the commit we amend, which gives us the final form of the tree ",
"", "",
"That being said, I can compare levels now based on structure and relative apostrophe differences. As long as your tree's `master` branch has the same structure and relative apostrophe differences, I'll give full credit" "That being said, I can compare levels now based on structure and relative apostrophe differences. As long as your tree's `master` branch has the same structure and relative apostrophe differences, I'll give full credit"