git drama next steps

2019-06-25 20:38:08 -04:00 · 2019-06-25 20:38:08 -04:00 · c008db2aea
parent ccd9b6cce7
commit c008db2aea
2 changed files with 2 additions and 2 deletions
--- a/misc/git_scripts/git_fetch_merge.bat
+++ b/misc/git_scripts/git_fetch_merge.bat
@ -1,2 +0,0 @@
-git fetch upstream
-git merge origin/master
--- a/misc/git_scripts/git_fetch_merge_fork.bat
+++ b/misc/git_scripts/git_fetch_merge_fork.bat
@ -0,0 +1,2 @@
+git fetch upstream
+git merge upstream/master