From 671dbc1ac9e57cac62361787abc2e5e7b3152531 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 30 Apr 2020 22:20:12 -0400 Subject: [PATCH] making things more reliable? --- Special/Tools/git_merge_wiki_git_into_normal_git.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/Special/Tools/git_merge_wiki_git_into_normal_git.bat b/Special/Tools/git_merge_wiki_git_into_normal_git.bat index dd56842b..5a530b22 100644 --- 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