With VSCode you can find the merge conflicts easily with the following UI.
(if you do not have the topbar, set "editor.codeLens": true
in User Preferences)
It indicates the current change that you have and incoming change from the server. This makes it easy to resolve the conflicts – just press the buttons above <<<< HEAD
.
If you have multiple changes and want to apply all of them at once – open command palette (View -> Command Palette) and start typing merge – multiple options will appear including Merge Conflict: Accept Incoming
, etc.