This resolves the issue that the comparison in the deploy-latest.sh script happens between the current local master and origin/master. This exits the deployment unless origin/master has been merged beforehand which adds an undesirable manual step.
A proposed solution is to do git diff with the base_branch which would exit if there are manual changes that have not been committed. In case some committed changes are there, as per line number 100, fast-forward merging will fail and the deployment will halt.
This resolves the issue that the comparison in the
deploy-latest.shscript happens between the current local master and origin/master. This exits the deployment unless origin/master has been merged beforehand which adds an undesirable manual step.A proposed solution is to do
git diffwith the base_branch which would exit if there are manual changes that have not been committed. In case some committed changes are there, as per line number 100, fast-forward merging will fail and the deployment will halt.