Reset dev branch to appropriate upstream and branch

master
Jordan Atwood 9 months ago
parent f098900581
commit bb2b91c11c
Signed by: nightfirecat
GPG Key ID: 615A619C2D73A6DF
  1. 4
      src/.bin/open-runelite.sh

@ -50,8 +50,8 @@ DIR="$(dirname "${BASH_SOURCE[0]}")"
RUNELITE_TARGET_COMMIT_FILENAME="$DIR/commit"
function build_client {
# Update local dev branch and build
git checkout dev || git checkout -b dev upstream/master
git reset --hard upstream/master
git checkout dev || git checkout -b dev
git reset --hard "$UPSTREAM_REMOTE/$UPSTREAM_BRANCH"
git merge --no-gpg-sign --no-edit "${BRANCHES_TO_MERGE[@]}" || exit 1
mvn clean package -DskipTests -U || exit 1
git checkout -

Loading…
Cancel
Save