From 29562a0ac2a0423f4d9b89e82d46139da026c6db Mon Sep 17 00:00:00 2001 From: bash <31279994+hermensbas@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:04:03 +0200 Subject: [PATCH] Update merge_core.sh --- helper/merge_core.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/helper/merge_core.sh b/helper/merge_core.sh index 6311f17..71100a3 100755 --- a/helper/merge_core.sh +++ b/helper/merge_core.sh @@ -1,6 +1,4 @@ #!/bin/bash -ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" - ########################################################################################## # General dependencies @@ -14,7 +12,7 @@ then ########################################################################################## # Try to merge from the orginal azerothcore into the playerbot azerothcore fork branch ########################################################################################## - cd ${ROOT_DIR}/../_download/azerothcore + cd ${ROOT_DIR}/_download/azerothcore git reset --hard origin/Playerbot git fetch upstream git merge upstream/master