floppydiscen/git-workshop
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: add suggestion for a new file for branching and merging

Browse Source
This commit is contained in:
Bjarke Sporring
2026-01-15 14:30:08 +01:00
parent 8a82253fc2
commit 40341d21a7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
01-essentials/03-branching-and-merging/README.md
View File

@@ -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`