core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean upstream before merging to ensure clean state

This commit is contained in:
Aikar 2019-04-02 21:46:32 -04:00
parent eb3be0ea5c
commit a32840b449
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/upstreamMerge.sh
View File

@ -9,7 +9,7 @@ gitcmd="git -c commit.gpgsign=false"
function update { function update {
cd "$workdir/$1" cd "$workdir/$1"
$gitcmd fetch && $gitcmd reset --hard origin/master $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
cd ../ cd ../
$gitcmd add $1 $gitcmd add $1
} }