Conflict too complex to resolve in web editor in Git

Nov '23 in Help

https://github.com/Alcladii/crypto-app/pull/9

I recently encounter this problem while I was trying to merge a branch on Git, the web editor was greyed out and it prompted that "These conflicts are too complex to solve in web editor". I had no problem using the web editor to fix the conflicts before, not sure what happened with this one, I reckoned that the changes I made to this one weren't that "complex". Anyone here know how I can fix it? Thanks in advance

1 comment

Comments are turned off for this post