Resume delivered work almost possible after ci job failed

[buep]

I know we can't resume work with git phlow easily, see #31 and #264 but the work around could be the following - except from it complains with an error, even though it work.

Why is that?

Here is what I did:

git checkout master
ghi create -m "test issues 6"
git phlow workon 6
date > date.log 
git phlow wrapup
git phlow deliver

echo "bugger, my ci job failed... forgot a change"

Now I try to clean up and prepare myself to resume the branch. I delete the failing remote so it can be pushed again, and rename the local branch that was delivered to what the original name was.
I also delete the local delivered/ branch so renaming works again later.

git push origin :ready/6-test-issues-6 
git checkout delivered/6-test-issues-6 
git branch 6-test-issues-6 
git checkout 6-test-issues-6 
git branch -D delivered/6-test-issues-6 

Now I'm on the a branch with the original name and fix the failure:

echo "missing change" >> date.log 
git phlow wrapup

But deliver fails:

$ git phlow deliver
delivering...
Error in rebasing: 
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> 6-test-issues-6


Delivered branch 6-test-issues-6 

$ git checkout ready/6-test-issues-6 
Branch ready/6-test-issues-6 set up to track remote branch ready/6-test-issues-6 from origin.
Switched to a new branch 'ready/6-test-issues-6'

$ cat date.log 
Tue Oct 31 20:54:30 CET 2017
missing change

[buep]

@groenborg says that the rebase error might be caused by the way I delete my branch, as this might change up tracking branches.

The above workflow should work if I go to git repository server and delete the branch through the UI.

It is the same workflow explained here: https://github.com/Praqma/git-phlow/tree/master/docs#did-deliver-but-meant-deliver---local

[buep]

I would like this issues to be wrapped up by just adding better documentation on the problem above and how to get out of it.

I think probably #283 fixes it - confirm it and close this one, or contribute to new documentation.

[mortench3000]

I don't understand why the rather simple workflow described under https://github.com/Praqma/git-phlow/blob/master/docs/troubleshooting.md#failed-build cannot be automated to the point where you can issue a git phlow wrapup after making the desired changes.
Maybe even introduce a prompt 'Are you sure (y/n)' before deleting the remote ready branch...