Syncing, branching and conflicts missing from website updates guide #31
Description
The Updating the website guide is missing details on syncing forks from maths/stack-web, branching (do we need to include this?) and conflicts missing from website updates guide.
A section on dealing with conflicts in PRs would be useful but I've never had to do this, it'd be good to do this in collaboration with someone else to artificially create conflicts