Simplify process for multiple changes

When doing multiple changes, the previous process involved stacked branches. This was unnecessary and it is easier to understand by recommending they switch back to the main branch before they create their new feature branch.
mikelorant · Mar 20, 2024 · b5e76ff · b5e76ff
1 parent 93d515d
commit b5e76ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/pages/do-the-change.md b/pages/do-the-change.md
@@ -58,13 +58,14 @@ preload: false
 layout: two-cols
 ---
 
-> What if I have other changes?
+> What if I have another change?
 
 <v-click>
 
-Create another feature branch.
+Create another feature branch from the `main` branch.
 
 ```shell
+git switch main
 git switch -c feature2
 git add -p
 git commit
@@ -84,6 +85,7 @@ gitGraph
   commit
   branch feature1
   commit
+  checkout main
   branch feature2
   commit
 ```

diff --git a/public/videos/do-the-change-feature2.webm b/public/videos/do-the-change-feature2.webm
diff --git a/scripts/video/tapes/do-the-change-feature2.tape b/scripts/video/tapes/do-the-change-feature2.tape
@@ -10,6 +10,8 @@ Ctrl+L
 
 Show Sleep 1
 
+Type "git switch main" Enter Sleep 1
+
 Source tapes/sources/git-commit-feature2.tape
 
 Ctrl+L Sleep 0.25
@@ -18,7 +20,7 @@ Type "git show -p" Sleep 1 Enter Sleep 3
 
 Ctrl+L Sleep 0.25
 
-Type "git branch"           Sleep 1 Enter Sleep 3
-Type "git log --oneline -2" Sleep 1 Enter Sleep 3
+Type "git branch"     Sleep 1 Enter Sleep 3
+Type "git log main.." Sleep 1 Enter Sleep 3
 
 Source tapes/sources/terminate.tape