Loading

Paste #pbwqwybj8

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

Comments