1. wrote a simple script for code upload and merge, but will continue to execute in case of conflict? How to avoid
2. wants him to interrupt execution if there is a conflict in git pull

@echo off
ECHO "pull front-code&&commit local to origin"
ECHO "******************"
ECHO "modify code"
git status
ECHO "***********"
git pull
ECHO "end pull"
git add .
git commit -m %1
git push
ECHO "end push front-code"
ECHO "************"
ECHO "start pull back-code"
CD ..\data-market-service
git pull
ECHO "end pull"
CD ..\dm_schedule_demo
ECHO "start build"
call npm run build
CD ..\data-market-service
git add .
git commit -m %1
git push
ECHO "finished"
PAUSE