https://www.git-brain.com/features/smart-conflict-resolver

Merge Conflict Editor for VS Code-Compatible IDEs

Resolve merge conflicts faster in VS Code-compatible IDEs with Git Brain's smart side-by-side resolver across supported IDEs.