twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-13 11:15:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean upstream before merging to ensure clean state

Browse Source
This commit is contained in:
Aikar
2019-04-02 21:46:32 -04:00
parent fba6eef5bd
commit 1ba5ee72ff
1 changed files with 1 additions and 1 deletions
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
} }