I have the following situation:
I have some changes on a branch, and another dev had closed and pushed the same branch.
When I tried to push I got the "push creates new remote head" message, but when I pulled there was nothing to pull, and when I attempted to merge I got the message that the branch only had one head.