merging latest from main repo to a fork

This works better than a web-gui initiated pull request when there are conflicts that must be resolved manually. From this link:

# First add the upstream remote:

git remote add upstream https://repoA
git fetch upstream

# Merge in upstream changes:

git checkout master
git merge upstream/master

# Resolve conflicts and push:

git push origin master

# Your pull request should automatically update