I’m contributing to another user’s repository. First I forked his repo, changed some files and made a pull request. He merged it and made a few more commits. I tried to merge them into my fork, but by mistake chose to squash them, so they were registered as my own commit. So now I can’t auto-merge (and neither can he, apparently), and all merges must be done manually. Is there any way to fix this?
Can I fix this by deleting my repo and forking again?