From 8c0cb2dfc06ddfa16d9f6815beeec9dd22531ab8 Mon Sep 17 00:00:00 2001
From: rke007
Date: Sun, 6 Apr 2025 10:14:45 +0530
Subject: [PATCH] Updated Demonstration Message
---
generatedDocs/levels.html | 2 +-
src/levels/intro/rebasing.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/generatedDocs/levels.html b/generatedDocs/levels.html
index 04c04440..780c7486 100755
--- a/generatedDocs/levels.html
+++ b/generatedDocs/levels.html
@@ -1337,7 +1337,7 @@ type git checkout -b [yourbranchname]
.
Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)
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.
Let's do that with the git rebase
command.
-git rebase main
Awesome! Now the work from our bugFix branch is right beneath main and we have a nice linear sequence of commits.
+git rebase main
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.
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.
The only problem is that main hasn't been updated either, let's do that now...
Now we are checked out on the main
branch. Let's go ahead and rebase onto bugFix
...
diff --git a/src/levels/intro/rebasing.js b/src/levels/intro/rebasing.js
index e2a374c6..077fd5a3 100644
--- a/src/levels/intro/rebasing.js
+++ b/src/levels/intro/rebasing.js
@@ -76,7 +76,7 @@ exports.level = {
"Let's do that with the `git rebase` command."
],
"afterMarkdowns": [
- "Awesome! Now the work from our bugFix branch is right beneath main and we have a nice linear sequence of commits.",
+ "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.",
"",
"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.",
"",