Has anyone run into this and found a fix???
I'm simply trying to merge a branch with my main. I've gone through and resolved everything except for a miscellaneous "Merge Conflict". It says I have conflicting updates. It asks which one to chose. I click on Use Branch... nothing happens. I click the other... nothing happens. AND I'm not able to complete the merge...
Any help would be amazing!
