Look at various techniques of using git diff and how to tie that into VS Code via a plugin
Learn how to use stash and kdiff3 to deal with conflicts in your code between branches when you either update from the repo or merge branches
Learn how to deal with conflicts in binary files