From 023bcc1aa50059b217d290dd9e69fd6c630f7e5b Mon Sep 17 00:00:00 2001 From: zleyyij Date: Wed, 23 Aug 2023 15:28:26 -0600 Subject: [PATCH] vault backup: 2023-08-23 15:28:26 --- The basics of Git.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/The basics of Git.md b/The basics of Git.md index 7130d09..5f07dea 100644 --- a/The basics of Git.md +++ b/The basics of Git.md @@ -50,4 +50,11 @@ - Fetch remote changes and apply them locally `git stash pop` - Take uncommitted changes, and apply them over the changes just added, using merge conflict markers. -Then open the project in any merge conflict resolver, and manually resolve the commit. Most IDEs have one of some form \ No newline at end of file +Then open the project in any merge conflict resolver, and manually resolve the commit. Most IDEs have one of some form, I like VScode's. + +## Working with branches +### Create a new branch +`git checkout -b [new-branch-name]` +- Create a new local branch +### Switch to an existing branch +`git check` \ No newline at end of file