From 40341d21a71d38e42512111335b1690d8ea8cea2 Mon Sep 17 00:00:00 2001 From: Bjarke Sporring Date: Thu, 15 Jan 2026 14:30:08 +0100 Subject: [PATCH] fix: add suggestion for a new file for branching and merging --- 01-essentials/03-branching-and-merging/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01-essentials/03-branching-and-merging/README.md b/01-essentials/03-branching-and-merging/README.md index 633ace7..d50aa3f 100644 --- a/01-essentials/03-branching-and-merging/README.md +++ b/01-essentials/03-branching-and-merging/README.md @@ -92,7 +92,7 @@ Now practice creating your own branch: 1. Change back to the `main` branch `git switch main` 2. Check the changes you committed before. You'll notice that they're gone! -3. Now edit a file or create a new file and add it and commit it on your `main` branch (hint: `git add .`, `git commit -m`) +3. Now edit a file or create a new file (perhaps GUIDE.md, content of the file doesn't matter) and add it and commit it on your `main` branch (hint: `git add .`, `git commit -m`) - This way we create diverging branches. The `main` branch has changes as well as your new `my-feature` branch. - Run `git log --oneline --graph --all` to see how the tree is looking 4. Switch back to your branch `git switch my-feature`