This page has moved to https://www.koskila.net/how-to-git-merge-upstream/
If you are not redirected automatically, please click the link above.