From 088480df05b4fd46214428c13a815ff333c8019c Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Wed, 24 Jun 2015 09:49:33 -0700 Subject: [PATCH] Resolves #297 combine dialogs --- src/levels/mixed/jugglingCommits.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/levels/mixed/jugglingCommits.js b/src/levels/mixed/jugglingCommits.js index 92bab64e..ebafdd23 100644 --- a/src/levels/mixed/jugglingCommits.js +++ b/src/levels/mixed/jugglingCommits.js @@ -67,14 +67,7 @@ exports.level = { "* 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)", "", - "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": [ + "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.", "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"