Git setup

Remotes

upstream

upstream should point at the main repository. Your workflow should be to fetch/pull from upstream. Update your local branches, then start working on a newly created feature branch

origin

origin should point to your fork.