From a1f7bda2d93c51c1e23403a038c0d4af48ccdac0 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 5 Jul 2020 14:21:32 -0700 Subject: [PATCH] Closes #718 -- clarify the two options we can do in our interactive rebase --- src/levels/rampup/interactiveRebase.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/levels/rampup/interactiveRebase.js b/src/levels/rampup/interactiveRebase.js index 7d2775c9..b662311a 100644 --- a/src/levels/rampup/interactiveRebase.js +++ b/src/levels/rampup/interactiveRebase.js @@ -73,11 +73,12 @@ exports.level = { "type": "ModalAlert", "options": { "markdowns": [ - "When the interactive rebase dialog opens, you have the ability to do 3 things:", + "When the interactive rebase dialog opens, you have the ability to do two things in our educational application:", "", "* You can reorder commits simply by changing their order in the UI (in our window this means dragging and dropping with the mouse).", "* You can choose to completely omit some commits. This is designated by `pick` -- toggling `pick` off means you want to drop the commit.", - "* Lastly, you can squash commits. Unfortunately our levels don't support this for a few logistical reasons, so I'll skip over the details of this. Long story short, though -- it allows you to combine commits.", + "", + "*It is worth mentioning that in the real git interactive rebase you can do many more things like squashing (combining) commits, amending commit messages, and even editing the commits themselves. For our purposes though we will focus on these two operations above.*", "", "Great! Let's see an example." ]