diff --git a/Special/Tools/git_merge_normal_git_into_wiki_git.bat b/Special/Tools/git_merge_normal_git_into_wiki_git.bat index 3ba38366..009ff774 100644 --- a/Special/Tools/git_merge_normal_git_into_wiki_git.bat +++ b/Special/Tools/git_merge_normal_git_into_wiki_git.bat @@ -5,5 +5,6 @@ git merge normal-git/master >> log.txt 2>>err.txt git push wiki-git HEAD:master >> log.txt 2>>err.txt git checkout master >> log.txt 2>>err.txt +git pull >> log.txt 2>>err.txt git branch -d wiki-git-local >> log.txt 2>>err.txt 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 03241b74..15ae3031 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 pull >> log.txt 2>>err.txt git fetch wiki-git >> log.txt 2>>err.txt git merge wiki-git/master >> log.txt 2>>err.txt git push >> log.txt 2>>err.txt