[GongOfFour]

No OP but I personally prefer the simplicity of VS Code's diff and conflict resolution point-and-click tooling to using ediff/smerge. I also work in a project with some very deep directory structures and like the VS Code sidebar much more.