diff --git a/entrypoint.sh b/entrypoint.sh
index 43b2007..c0c5d99 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -56,6 +56,11 @@ git push origin
 
 MERGE_RESULT=$(git merge ${MERGE_ARGS} upstream/${UPSTREAM_BRANCH})
 
+retval=$?
+if [[ "$retval" != "0" ]] ; then
+  echo "Git merge failed with return value: $retval"
+  exit $retval
+fi
 
 if [[ $MERGE_RESULT == "" ]] 
 then