From 06e6090f39160049156f549e875d2a1e8ba72dc1 Mon Sep 17 00:00:00 2001 From: Lee Stott Date: Fri, 3 Oct 2025 14:31:29 +0100 Subject: [PATCH] Update 1-getting-started-lessons/2-github-basics/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- 1-getting-started-lessons/2-github-basics/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1-getting-started-lessons/2-github-basics/README.md b/1-getting-started-lessons/2-github-basics/README.md index 22ce2e3a..3d215eee 100644 --- a/1-getting-started-lessons/2-github-basics/README.md +++ b/1-getting-started-lessons/2-github-basics/README.md @@ -243,10 +243,11 @@ Let's go through a contributor workflow. Assume the contributor has already _for git merge main ``` + The `git merge main` command will bring in all changes from `main` into your branch. Hopefully you can just continue. If not, VS Code will tell you where Git is _confused_ and you just alter the affected files to say which content is the most accurate. + To switch to a different branch, use the modern `git switch` command: ```bash git switch [branch_name] - This will bring in all changes from `main` into your branch and hopefully you can just continue. If not, VS Code will tell you where Git is _confused_ and you just alter the affected files to say which content is the most accurate. 1. **Send your work to GitHub**. Sending your work to GitHub means two things. Pushing your branch to your repo and then open up a PR, Pull Request.