Skip to content

Commit

Permalink
Add a section on rebase.
Browse files Browse the repository at this point in the history
  • Loading branch information
rteyssier committed Sep 5, 2024
1 parent 6346aa3 commit 9180ccd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion content/week02/advanced_steps.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9180ccd

Please sign in to comment.