Skip to content

Commit 8c0cb2d

Browse files
committed
Updated Demonstration Message
1 parent e61a74a commit 8c0cb2d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎generatedDocs/levels.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@ <h3>Level: Rebase Introduction</h3><h2 id="git-rebase">Git Rebase</h2>
13371337
<p>Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)</p>
13381338
<p>We would like to move our work from bugFix directly onto the work from main. That way it would look like these two features were developed sequentially, when in reality they were developed in parallel.</p>
13391339
<p>Let&#39;s do that with the <code>git rebase</code> command.</p>
1340-
<pre class="level-solution">git rebase main</pre><p>Awesome! Now the work from our bugFix branch is right beneath main and we have a nice linear sequence of commits.</p>
1340+
<pre class="level-solution">git rebase main</pre><p>Awesome! Now the work from our bugFix branch is stacked "on top of main", since it points to main. In our visualization though, its shown below main since our commit trees flow downwards.</p>
13411341
<p>Note that the commit C3 still exists somewhere (it has a faded appearance in the tree), and C3&#39; is the &quot;copy&quot; that we rebased onto main.</p>
13421342
<p>The only problem is that main hasn&#39;t been updated either, let&#39;s do that now...</p>
13431343
<p>Now we are checked out on the <code>main</code> branch. Let&#39;s go ahead and rebase onto <code>bugFix</code>...</p>

‎src/levels/intro/rebasing.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ exports.level = {
7676
"Let's do that with the `git rebase` command."
7777
],
7878
"afterMarkdowns": [
79-
"Awesome! Now the work from our bugFix branch is right beneath main and we have a nice linear sequence of commits.",
79+
"Awesome! Now the work from our bugFix branch is stacked \"on top of main\", since it points to main. In our visualization though, its shown below main since our commit trees flow downwards.",
8080
"",
8181
"Note that the commit C3 still exists somewhere (it has a faded appearance in the tree), and C3' is the \"copy\" that we rebased onto main.",
8282
"",

0 commit comments

Comments
 (0)