mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-20 21:35:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1239 from rke007/main
Some checks failed
Docker - learnGitBranching image / build-and-push-image (push) Has been cancelled
Details

Browse source 
Updated Demonstration Message for Intro4
This commit is contained in:
Peter Cottle 2025-04-06 16:30:47 -04:00 • committed by GitHub
commit e25eba00c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
generatedDocs/levels.html
View file

@ -1337,7 +1337,7 @@ type <code>git checkout -b [yourbranchname]</code>.</p>
<p>Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)</p>
<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>
<p>Let&#39;s do that with the <code>git rebase</code> command.</p>
<pre class="level-solution">git rebase main</pre><p>Awesome! Now the work from our bugFix branch is right on top of main and we have a nice linear sequence of commits.</p>
<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>
<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>
<p>The only problem is that main hasn&#39;t been updated either, let&#39;s do that now...</p>
<p>Now we are checked out on the <code>main</code> branch. Let&#39;s go ahead and rebase onto <code>bugFix</code>...</p>

2
src/levels/intro/rebasing.js
View file

@ -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 on top of 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.",
"",