I am trying to merge a branch in main and when I am trying to resolve conflicts (as I can’t merge without resolving conflicts) it tries to load conflicts and then suddenly screen goes blank, nothing is shown except a blank screen. I am not able to see the conflict so can’t resolve it and hence not able to merge branch.
Question
Unable to resolve Conflicts with Main File in Branch
This is happening to me too - following this topic to see if there’s further resolution on this.
I’m having the same issue when I’m trying to update from main.
EDIT: I solved updating first all things from Update panel and then Update from main.
Reply
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.