I ctrl-C'd at the first (server ssh) password prompt. (Ironically this was because I was not in the root of the repo, and wanted to be careful.)
I then repeated the same command (once I had cd'd into the root).
What I hadn't realised was that the first invocation has moved me back to the "develop" branch before I ctrl-C'd at the password prompt.
The result of attempting the "finish" a second time was an empty merge of develop into develop and the permanent deletion of the feature/battery branch (and all the commits) from both my local machine and the server.
Neither "git reflog" or "git fsck" was able to find any trace of the "feature/battery" branch or its commits.
(Luckily, I "git pull"-ed onto a third machine and so I have lost only one commit.)
Perhaps there needs to be a warning when finishing a feature when you're in develop?
This morning I did:
while in the feature/battery branch.
I ctrl-C'd at the first (server ssh) password prompt. (Ironically this was because I was not in the root of the repo, and wanted to be careful.)
I then repeated the same command (once I had cd'd into the root).
What I hadn't realised was that the first invocation has moved me back to the "develop" branch before I ctrl-C'd at the password prompt.
The result of attempting the "finish" a second time was an empty merge of develop into develop and the permanent deletion of the feature/battery branch (and all the commits) from both my local machine and the server.
Neither "git reflog" or "git fsck" was able to find any trace of the "feature/battery" branch or its commits.
(Luckily, I "git pull"-ed onto a third machine and so I have lost only one commit.)
Perhaps there needs to be a warning when finishing a feature when you're in develop?