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

2023-08-23 15:27:26 -06:00 · 2023-08-23 15:27:26 -06:00 · 134405f4ee
commit 134405f4ee
parent b955415df9
1 changed files with 2 additions and 1 deletions
--- a/Git.md
+++ b/Git.md
@ -49,4 +49,5 @@
 `git pull -r`
 - Fetch remote changes and apply them locally
 `git stash pop`
- - Take uncommitted changes, and apply them 
+ - 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