Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- espers-MacBook-Pro:Company2 jesper$ git add .
- jespers-MacBook-Pro:Company2 jesper$ git commit -m "fixed so that standard unittests doesnt crash for apiteam"
- [Development ef58c42] fixed so that standard unittests doesnt crash for apiteam
- 6 files changed, 239 insertions(+), 180 deletions(-)
- jespers-MacBook-Pro:Company2 jesper$ git push
- To https://github.com/Eriwi/Company2.git
- ! [rejected] Development -> Development (fetch first)
- error: failed to push some refs to 'https://github.com/Eriwi/Company2.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.
- jespers-MacBook-Pro:Company2 jesper$ git fetch
- remote: Enumerating objects: 53, done.
- remote: Counting objects: 100% (53/53), done.
- remote: Compressing objects: 100% (32/32), done.
- remote: Total 53 (delta 20), reused 45 (delta 18), pack-reused 0
- Unpacking objects: 100% (53/53), done.
- From https://github.com/Eriwi/Company2
- 80dd3cd..680f4a8 Development -> origin/Development
- 45fb41c..0fadb82 Scanner -> origin/Scanner
- jespers-MacBook-Pro:Company2 jesper$ git status
- On branch Development
- Your branch and 'origin/Development' have diverged,
- and have 1 and 2 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- nothing to commit, working tree clean
- jespers-MacBook-Pro:Company2 jesper$ git status
- On branch Development
- Your branch and 'origin/Development' have diverged,
- and have 1 and 2 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- nothing to commit, working tree clean
- jespers-MacBook-Pro:Company2 jesper$ git pull
- Merge made by the 'recursive' strategy.
- .idea/.gitignore | 3 +++
- .idea/Company2.iml | 12 +++++++++
- .idea/inspectionProfiles/Project_Default.xml | 6 +++++
- .idea/misc.xml | 6 +++++
- .idea/modules.xml | 8 ++++++
- .idea/vcs.xml | 6 +++++
- vITalAngular/src/app/app-routing.module.ts | 2 ++
- vITalAngular/src/app/app.module.ts | 6 +++--
- vITalAngular/src/app/home/home.component.html | 6 +++++
- vITalAngular/src/app/home/home.component.ts | 8 +++++-
- vITalAngular/src/app/login/login.component.html | 1 +
- vITalAngular/src/app/logout/logout.component.css | 0
- vITalAngular/src/app/logout/logout.component.html | 18 ++++++++++++++
- .../src/app/logout/logout.component.spec.ts | 25 +++++++++++++++++++
- vITalAngular/src/app/logout/logout.component.ts | 29 ++++++++++++++++++++++
- 15 files changed, 133 insertions(+), 3 deletions(-)
- create mode 100644 .idea/.gitignore
- create mode 100644 .idea/Company2.iml
- create mode 100644 .idea/inspectionProfiles/Project_Default.xml
- create mode 100644 .idea/misc.xml
- create mode 100644 .idea/modules.xml
- create mode 100644 .idea/vcs.xml
- create mode 100644 vITalAngular/src/app/logout/logout.component.css
- create mode 100644 vITalAngular/src/app/logout/logout.component.html
- create mode 100644 vITalAngular/src/app/logout/logout.component.spec.ts
- create mode 100644 vITalAngular/src/app/logout/logout.component.ts
- jespers-MacBook-Pro:Company2 jesper$ git status
- On branch Development
- Your branch is ahead of 'origin/Development' by 2 commits.
- (use "git push" to publish your local commits)
- nothing to commit, working tree clean
- jespers-MacBook-Pro:Company2 jesper$ git status
- On branch Development
- Your branch is ahead of 'origin/Development' by 2 commits.
- (use "git push" to publish your local commits)
- nothing to commit, working tree clean
- jespers-MacBook-Pro:Company2 jesper$ git push
- Enumerating objects: 40, done.
- Counting objects: 100% (36/36), done.
- Delta compression using up to 4 threads
- Compressing objects: 100% (20/20), done.
- Writing objects: 100% (20/20), 6.71 KiB | 981.00 KiB/s, done.
- Total 20 (delta 17), reused 0 (delta 0)
- remote: Resolving deltas: 100% (17/17), completed with 13 local objects.
- To https://github.com/Eriwi/Company2.git
- 680f4a8..a580b64 Development -> Development
- jespers-MacBook-Pro:Company2 jesper$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement