First time using vim diff mode to merge differnt versions of a file. Before that I need to connect VSCode to ssh everytime doing remotely.
Usage:
vim -d file1 file2
Then you can use ]c and [c to jump between changes, and do and dp to merge changes from one side to another.
Easier than I thought.
Also, to enable mouse mode, add set mouse=a to your vimrc, then you can click to jump between changes as well.