Dev is based off main; it is a work in progress for a new release, so it has much different code than main. I had to do a quick bugfix on the current version of my software, so I created a hotfix branch directly from main, then merged it back into main, no problem. Now, I need that hotfix in dev and my working branch from dev as well. When I try to merge the hotfix into either of these branches GitHub says:
"There isn’t anything to compare. dev is up to date with all commits from hotfix. Try switching the base for your comparison."
I know, in fact, the changes in hotfix are not in dev. This is wasting so much of my time, please help.