From 40ab0d9c0d42201a6548524e5c7821a02d35d561 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 7 Jun 2018 00:11:22 +0300 Subject: fix for resolving conflicts during poll --- tools/build_scripts/git_update.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build_scripts/git_update.bat b/tools/build_scripts/git_update.bat index 684ee6d786..d32d190bae 100644 --- a/tools/build_scripts/git_update.bat +++ b/tools/build_scripts/git_update.bat @@ -3,10 +3,10 @@ if "%1" == "" ( exit 1 ) -git checkout %1 - git reset --hard +git checkout %1 + git pull --rebase=true --progress -v echo %date% %time% > timestamp.chk \ No newline at end of file -- cgit v1.2.3