From a32840b44974045a24260732cb01e700f61184d9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 2 Apr 2019 21:46:32 -0400
Subject: [PATCH] Clean upstream before merging to ensure clean state

---
 scripts/upstreamMerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh
index 6d9541970..a54b7c10e 100755
--- a/scripts/upstreamMerge.sh
+++ b/scripts/upstreamMerge.sh
@@ -9,7 +9,7 @@ gitcmd="git -c commit.gpgsign=false"
 
 function update {
     cd "$workdir/$1"
-    $gitcmd fetch && $gitcmd reset --hard origin/master
+    $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
     cd ../
     $gitcmd add $1
 }