I was working on fixing merge conflicts from the main branch to my local feature branch. After fixing all the conflicts I accidentally pushed the merge commit directly to the upstream remote feature branch instead of origin I immediately reverted the merge with git revert <merge commit> -m 1 and pushed it back to upstream remote.
But I noticed that when I tried locally to merge main into the feature branch again that I was no longer seeing the same merge conflicts. It went from about 50 conflicts to just 3. I don't understand why when I try to merge that I'm not seeing those 50 conflicts anymore and I'm now worried that the feature branch is now in a bad state.
Can someone explain to me why I'm seeing this and how to fix this?
