hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto-stage after minimize, continue rebase if no conflicts

Browse source
This commit is contained in:
Thulinma 2021-09-23 10:16:45 +02:00
parent f614730e38
commit 5a6982e093
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
embed/minimize_internal.sh
View file

@ -60,3 +60,10 @@ echo " Minimizing CSS..";
#fi #fi
echo " Done."; echo " Done.";
echo "Done."; echo "Done.";
git add min
echo "Staged."
CONFLICTS=`git diff --name-only --diff-filter=U`
if [ -z "$CONFLICTS" ] ; then
git status | grep "rebase in progress" > /dev/null && echo "No more conflicts; continuing rebase!" && git rebase --continue
fi