diff --git a/pages/do-the-change.md b/pages/do-the-change.md index cf15b87..5a30d67 100644 --- 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? -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 index b42b96d..d9bb8f2 100644 --- a/public/videos/do-the-change-feature2.webm +++ b/public/videos/do-the-change-feature2.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a5516e43b544299f99f64961e63991477bc15339064cfc7791ba505f80490e1 -size 282125 +oid sha256:4d5d38e35303b3ec1df88669e19356079bc54421fd6a2fd53b46517f9ec236a8 +size 389206 diff --git a/scripts/video/tapes/do-the-change-feature2.tape b/scripts/video/tapes/do-the-change-feature2.tape index d836a02..b9389b7 100644 --- 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