arc/notes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vault backup: 2023-08-23 15:28:26

Browse Source
This commit is contained in:
zleyyij 2023-08-23 15:28:26 -06:00
parent 134405f4ee
commit 023bcc1aa5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
The basics of Git.md
View File

@ -50,4 +50,11 @@
- Fetch remote changes and apply them locally - Fetch remote changes and apply them locally
`git stash pop` `git stash pop`
- Take uncommitted changes, and apply them over the changes just added, using merge conflict markers. - 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 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`