Advertisement
Guest User

Untitled

a guest
Oct 15th, 2019
742
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.39 KB | None | 0 0
  1. espers-MacBook-Pro:Company2 jesper$ git add .
  2. jespers-MacBook-Pro:Company2 jesper$ git commit -m "fixed so that standard unittests doesnt crash for apiteam"
  3. [Development ef58c42] fixed so that standard unittests doesnt crash for apiteam
  4. 6 files changed, 239 insertions(+), 180 deletions(-)
  5. jespers-MacBook-Pro:Company2 jesper$ git push
  6. To https://github.com/Eriwi/Company2.git
  7. ! [rejected] Development -> Development (fetch first)
  8. error: failed to push some refs to 'https://github.com/Eriwi/Company2.git'
  9. hint: Updates were rejected because the remote contains work that you do
  10. hint: not have locally. This is usually caused by another repository pushing
  11. hint: to the same ref. You may want to first integrate the remote changes
  12. hint: (e.g., 'git pull ...') before pushing again.
  13. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  14. jespers-MacBook-Pro:Company2 jesper$ git fetch
  15. remote: Enumerating objects: 53, done.
  16. remote: Counting objects: 100% (53/53), done.
  17. remote: Compressing objects: 100% (32/32), done.
  18. remote: Total 53 (delta 20), reused 45 (delta 18), pack-reused 0
  19. Unpacking objects: 100% (53/53), done.
  20. From https://github.com/Eriwi/Company2
  21. 80dd3cd..680f4a8 Development -> origin/Development
  22. 45fb41c..0fadb82 Scanner -> origin/Scanner
  23. jespers-MacBook-Pro:Company2 jesper$ git status
  24. On branch Development
  25. Your branch and 'origin/Development' have diverged,
  26. and have 1 and 2 different commits each, respectively.
  27. (use "git pull" to merge the remote branch into yours)
  28.  
  29. nothing to commit, working tree clean
  30. jespers-MacBook-Pro:Company2 jesper$ git status
  31. On branch Development
  32. Your branch and 'origin/Development' have diverged,
  33. and have 1 and 2 different commits each, respectively.
  34. (use "git pull" to merge the remote branch into yours)
  35.  
  36. nothing to commit, working tree clean
  37. jespers-MacBook-Pro:Company2 jesper$ git pull
  38. Merge made by the 'recursive' strategy.
  39. .idea/.gitignore | 3 +++
  40. .idea/Company2.iml | 12 +++++++++
  41. .idea/inspectionProfiles/Project_Default.xml | 6 +++++
  42. .idea/misc.xml | 6 +++++
  43. .idea/modules.xml | 8 ++++++
  44. .idea/vcs.xml | 6 +++++
  45. vITalAngular/src/app/app-routing.module.ts | 2 ++
  46. vITalAngular/src/app/app.module.ts | 6 +++--
  47. vITalAngular/src/app/home/home.component.html | 6 +++++
  48. vITalAngular/src/app/home/home.component.ts | 8 +++++-
  49. vITalAngular/src/app/login/login.component.html | 1 +
  50. vITalAngular/src/app/logout/logout.component.css | 0
  51. vITalAngular/src/app/logout/logout.component.html | 18 ++++++++++++++
  52. .../src/app/logout/logout.component.spec.ts | 25 +++++++++++++++++++
  53. vITalAngular/src/app/logout/logout.component.ts | 29 ++++++++++++++++++++++
  54. 15 files changed, 133 insertions(+), 3 deletions(-)
  55. create mode 100644 .idea/.gitignore
  56. create mode 100644 .idea/Company2.iml
  57. create mode 100644 .idea/inspectionProfiles/Project_Default.xml
  58. create mode 100644 .idea/misc.xml
  59. create mode 100644 .idea/modules.xml
  60. create mode 100644 .idea/vcs.xml
  61. create mode 100644 vITalAngular/src/app/logout/logout.component.css
  62. create mode 100644 vITalAngular/src/app/logout/logout.component.html
  63. create mode 100644 vITalAngular/src/app/logout/logout.component.spec.ts
  64. create mode 100644 vITalAngular/src/app/logout/logout.component.ts
  65. jespers-MacBook-Pro:Company2 jesper$ git status
  66. On branch Development
  67. Your branch is ahead of 'origin/Development' by 2 commits.
  68. (use "git push" to publish your local commits)
  69.  
  70. nothing to commit, working tree clean
  71. jespers-MacBook-Pro:Company2 jesper$ git status
  72. On branch Development
  73. Your branch is ahead of 'origin/Development' by 2 commits.
  74. (use "git push" to publish your local commits)
  75.  
  76. nothing to commit, working tree clean
  77. jespers-MacBook-Pro:Company2 jesper$ git push
  78. Enumerating objects: 40, done.
  79. Counting objects: 100% (36/36), done.
  80. Delta compression using up to 4 threads
  81. Compressing objects: 100% (20/20), done.
  82. Writing objects: 100% (20/20), 6.71 KiB | 981.00 KiB/s, done.
  83. Total 20 (delta 17), reused 0 (delta 0)
  84. remote: Resolving deltas: 100% (17/17), completed with 13 local objects.
  85. To https://github.com/Eriwi/Company2.git
  86. 680f4a8..a580b64 Development -> Development
  87. jespers-MacBook-Pro:Company2 jesper$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement