OpenTTD-website.andythenorth(2019-update-content)$ git co master Switched to branch 'master' Your branch is up to date with 'origin/master'. OpenTTD-website.andythenorth(master)$ git fetch upstream remote: Enumerating objects: 28, done. remote: Counting objects: 100% (28/28), done. remote: Compressing objects: 100% (12/12), done. remote: Total 28 (delta 16), reused 27 (delta 16), pack-reused 0 Unpacking objects: 100% (28/28), done. From https://github.com/OpenTTD/website 559fa7b..07c63e9 master -> upstream/master + 55a2815...97d9b4f monthly-dev-post -> upstream/monthly-dev-post (forced update) * [new tag] 1.1.10 -> 1.1.10 * [new tag] 1.1.7 -> 1.1.7 * [new tag] 1.1.8 -> 1.1.8 * [new tag] 1.1.9 -> 1.1.9 OpenTTD-website.andythenorth(master)$ git rebase upstream/master First, rewinding head to replay your work on top of it... Fast-forwarded master to upstream/master. OpenTTD-website.andythenorth(master)$ git push To https://github.com/andythenorth/website.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/andythenorth/website.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. OpenTTD-website.andythenorth(master)$ git pull remote: Enumerating objects: 3, done. remote: Counting objects: 100% (3/3), done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), done. From https://github.com/andythenorth/website 559fa7b..7aec4e4 master -> origin/master Merge made by the 'recursive' strategy. _config.yml | 2 ++ 1 file changed, 2 insertions(+) OpenTTD-website.andythenorth(master)$ git log -l5 commit 6299eae80ce29ed607329985670dc38ab30f79a8 (HEAD -> master) Merge: 07c63e9 7aec4e4 Author: Andy Date: Fri Apr 5 06:43:28 2019 +0100 Merge branch 'master' of https://github.com/andythenorth/website