You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: generatedDocs/levels.html
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -1337,7 +1337,7 @@ <h3>Level: Rebase Introduction</h3><h2 id="git-rebase">Git Rebase</h2>
1337
1337
<p>Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)</p>
1338
1338
<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>
1339
1339
<p>Let's do that with the <code>git rebase</code> command.</p>
1340
-
<preclass="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>
1340
+
<preclass="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>
1341
1341
<p>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.</p>
1342
1342
<p>The only problem is that main hasn't been updated either, let's do that now...</p>
1343
1343
<p>Now we are checked out on the <code>main</code> branch. Let's go ahead and rebase onto <code>bugFix</code>...</p>
0 commit comments