For detail instruction on how to setup VSCODE as a merge tool:
https://davidrunger.com/blog/using-vs-code-as-a-rails-app-update-merge-tool