From dbe25a680607ae77bd82d78adc85e167a8544ef2 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sun, 21 Dec 2014 23:11:53 +0100 Subject: force checkout to avoid some problems [skip ci] --- plugins/LanguagesManager/Commands/CreatePull.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/LanguagesManager/Commands') diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php index 356f4e213f..bf208ac332 100644 --- a/plugins/LanguagesManager/Commands/CreatePull.php +++ b/plugins/LanguagesManager/Commands/CreatePull.php @@ -49,7 +49,7 @@ class CreatePull extends TranslationBase chdir(PIWIK_DOCUMENT_ROOT); shell_exec(' - git checkout master > /dev/null 2>&1 + git checkout -f master > /dev/null 2>&1 git pull > /dev/null 2>&1 git submodule init > /dev/null 2>&1 git submodule update > /dev/null 2>&1 @@ -75,7 +75,7 @@ class CreatePull extends TranslationBase // switch to branch and update it to latest master shell_exec(' - git checkout translationupdates > /dev/null 2>&1 + git checkout -f translationupdates > /dev/null 2>&1 git merge master > /dev/null 2>&1 git push origin translationupdates > /dev/null 2>&1 '); -- cgit v1.2.3