From 2ac8fc23d361ace7c6edfe994f7547be934c47f5 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Mon, 4 Jan 2021 08:30:00 -0700 Subject: [PATCH] Resolves #526 -- better language around the pick button --- src/levels/rampup/interactiveRebase.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/levels/rampup/interactiveRebase.js b/src/levels/rampup/interactiveRebase.js index da97a036..d858f2ed 100644 --- a/src/levels/rampup/interactiveRebase.js +++ b/src/levels/rampup/interactiveRebase.js @@ -75,10 +75,12 @@ exports.level = { "markdowns": [ "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.", + "* You can reorder commits simply by changing their order in the UI (via dragging and dropping with the mouse).", + "* You can choose to keep all commits or drop specific ones. When the dialog opens, each commit is set to being included by the `pick` " + + "button being active. To drop a commit, click the `pick` button to toggle it off.", "", - "*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.*", + "*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." ]