Advertisement
ostromland

Untitled

Oct 22nd, 2018
88
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.86 KB | None | 0 0
  1. ostrom@uzero:/var/www/adventor$ git push
  2. Enter passphrase for key '/home/ostrom/.ssh/id_rsa':
  3. To git@github.com:iteanorway/adventor.git
  4. ! [rejected] master -> master (fetch first)
  5. error: failed to push some refs to 'git@github.com:iteanorway/adventor.git'
  6. hint: Updates were rejected because the remote contains work that you do
  7. hint: not have locally. This is usually caused by another repository pushing
  8. hint: to the same ref. You may want to first integrate the remote changes
  9. hint: (e.g., 'git pull ...') before pushing again.
  10. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  11. ostrom@uzero:/var/www/adventor$ git pull
  12. Enter passphrase for key '/home/ostrom/.ssh/id_rsa':
  13. remote: Enumerating objects: 10, done.
  14. remote: Counting objects: 100% (10/10), done.
  15. remote: Compressing objects: 100% (2/2), done.
  16. remote: Total 10 (delta 7), reused 10 (delta 7), pack-reused 0
  17. Unpacking objects: 100% (10/10), done.
  18. From github.com:iteanorway/adventor
  19. a55d759..0d13968 master -> origin/master
  20. Merge made by the 'recursive' strategy.
  21. app/Classes/ExternalRequester.php | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
  22. app/IntegrationInformation.php | 33 ++++++++++++++++
  23. app/Observers/CustomerObserver.php | 1 +
  24. app/Traits/Loggable.php | 1 +
  25. 4 files changed, 165 insertions(+), 116 deletions(-)
  26. ostrom@uzero:/var/www/adventor$ git push
  27. Enter passphrase for key '/home/ostrom/.ssh/id_rsa':
  28. Counting objects: 5, done.
  29. Delta compression using up to 6 threads.
  30. Compressing objects: 100% (5/5), done.
  31. Writing objects: 100% (5/5), 595 bytes | 0 bytes/s, done.
  32. Total 5 (delta 3), reused 0 (delta 0)
  33. remote: Resolving deltas: 100% (3/3), completed with 2 local objects.
  34. To git@github.com:iteanorway/adventor.git
  35. 0d13968..80552dd master -> master
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement