I'm constantly hitting merge conflicts when pulling from the remote. Any tips for handling them directly in VS Code?

Use the built‑in merge editor. When a conflict appears, VS Code shows both sides and lets you pick yours, theirs, or both.

You can also run git mergetool from the terminal integrated in VS Code for a more graphical view.