git-phlow icon indicating copy to clipboard operation
git-phlow copied to clipboard

don't continue on error

Open astyltsvig opened this issue 7 years ago • 0 comments

I'm running this one here - I get an error on the rebase - but the script continues anyway ....AAAArgh!!

oem@oem-HP-ENVY-15-Notebook-PC:~/Desktop/Prolike/gitlabelwizard$ git deliver --verbose
Exec: git status
Exec: git config --get phlow.service
Exec: git config --get phlow.issue-api
Exec: git config --get phlow.issue-web
Exec: git config --get phlow.remote
Exec: git config --get phlow.delivery-branch-prefix
Exec: git config --get phlow.integration-branch
Exec: git ls-remote --get-url origin
Exec: git config --get phlow.token
delivering...
Exec: git branch -a
Exec: git pull --rebase
Error in rebasing: 
warning: redirecting to https://github.com/prolike/gitlabelwizard.git/

It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
	git rebase (--continue | --abort | --skip)
If that is not the case, please
	rm -fr "/home/oem/Desktop/Prolike/gitlabelwizard/.git/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.

Exec: git push origin 126-fix-circle-ci:ready/126-fix-circle-ci
Exec: git branch -m 126-fix-circle-ci delivered/126-fix-circle-ci
Exec: git checkout master
Delivered branch 126-fix-circle-ci 

astyltsvig avatar Feb 14 '19 10:02 astyltsvig