Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ostrom@uzero:/var/www/adventor$ git push
- Enter passphrase for key '/home/ostrom/.ssh/id_rsa':
- To git@github.com:iteanorway/adventor.git
- ! [rejected] master -> master (fetch first)
- error: failed to push some refs to 'git@github.com:iteanorway/adventor.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.
- ostrom@uzero:/var/www/adventor$ git pull
- Enter passphrase for key '/home/ostrom/.ssh/id_rsa':
- remote: Enumerating objects: 10, done.
- remote: Counting objects: 100% (10/10), done.
- remote: Compressing objects: 100% (2/2), done.
- remote: Total 10 (delta 7), reused 10 (delta 7), pack-reused 0
- Unpacking objects: 100% (10/10), done.
- From github.com:iteanorway/adventor
- a55d759..0d13968 master -> origin/master
- Merge made by the 'recursive' strategy.
- app/Classes/ExternalRequester.php | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
- app/IntegrationInformation.php | 33 ++++++++++++++++
- app/Observers/CustomerObserver.php | 1 +
- app/Traits/Loggable.php | 1 +
- 4 files changed, 165 insertions(+), 116 deletions(-)
- ostrom@uzero:/var/www/adventor$ git push
- Enter passphrase for key '/home/ostrom/.ssh/id_rsa':
- Counting objects: 5, done.
- Delta compression using up to 6 threads.
- Compressing objects: 100% (5/5), done.
- Writing objects: 100% (5/5), 595 bytes | 0 bytes/s, done.
- Total 5 (delta 3), reused 0 (delta 0)
- remote: Resolving deltas: 100% (3/3), completed with 2 local objects.
- To git@github.com:iteanorway/adventor.git
- 0d13968..80552dd master -> master
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement