From 9180ccdfe261f6cd1e4c318ee1d0309a3e3c2203 Mon Sep 17 00:00:00 2001 From: Romain Teyssier Date: Thu, 5 Sep 2024 12:05:07 -0400 Subject: [PATCH] Add a section on rebase. --- content/week02/advanced_steps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/week02/advanced_steps.md b/content/week02/advanced_steps.md index 2ec44c8..986bf7b 100644 --- a/content/week02/advanced_steps.md +++ b/content/week02/advanced_steps.md @@ -571,7 +571,7 @@ back to the master branch with complex patterns. one entire diverging branch after the other. Let's try an example. Go back to the repository `mywork`. Checkout branch `better_code` and create a new file called `file6.txt`. Don't forget to `git add` and `git commit`. Then checkout branch `master` and create a new -file called `file7.txt`. Again, `gti add` and `git commit`. +file called `file7.txt`. Again, `git add` and `git commit`. If you `git log`, you will see now 2 diverging branches like before. This time, we will combine these 2 branches using