When trying to merge a pull request and faced with hundreds of conflicts the UI option in Github will no longer be an option.. and instead you are going to have to do the merge yourself using the command line!
Luckily vscode makes this process visual and easy to digest. It has become my preference for resolving any number of conflicts.
Lets take a look at the following scenario:
