Updating your project

In VS Code, open a terminal (Terminal > New Terminal), then:

Add papermario-dx as a remote named upstream

git remote add upstream https://github.com/bates64/papermario-dx.git

Fetch the latest changes

git fetch upstream

Merge the latest changes into your main branch

git checkout main
git merge upstream/main

Resolve any merge conflicts

VS Code highlights conflicting sections in the editor with buttons like Accept Current Change, Accept Incoming Change, and Accept Both Changes. Stage each resolved file in the Source Control panel (Ctrl+Shift+G), then commit the merge.

Build

Build as usual with Ctrl+Shift+B.