making things more reliable?

2020-04-30 22:20:12 -04:00 · 2020-04-30 22:20:12 -04:00 · 671dbc1ac9
parent 8c404b32db
commit 671dbc1ac9
1 changed files with 1 additions and 0 deletions
--- a/Special/Tools/git_merge_wiki_git_into_normal_git.bat
+++ b/Special/Tools/git_merge_wiki_git_into_normal_git.bat
@ -1,5 +1,6 @@

 git checkout master                         >> log.txt 2>>err.txt
+git reset --hard origin/master              >> log.txt 2>>err.txt
 git pull                                    >> log.txt 2>>err.txt
 git fetch temp-wiki-git                     >> log.txt 2>>err.txt
 git merge temp-wiki-git/master              >> log.txt 2>>err.txt