search

felixschndr / dotfiles

These are my personal bash aliases and functions I use on a daily basis
1 stars 0 forks source link

Es kommt nicht die Anzeige, dass erst ein Pull gemacht werden muss vor dem Push #8

Closed felixschndr closed 3 years ago

felixschndr commented 3 years ago 
Felix Schneider@Asterix MINGW64 ~/OneDrive - bwedu/Studium/3. Semester/Betriebssysteme/bslab (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean

Felix Schneider@Asterix MINGW64 ~/OneDrive - bwedu/Studium/3. Semester/Betriebssysteme/bslab (master)
$ git push
To github.com:Trysupe/bslab.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'github.com:Trysupe/bslab.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.

Felix Schneider@Asterix MINGW64 ~/OneDrive - bwedu/Studium/3. Semester/Betriebssysteme/bslab (master)
$ git pull
remote: Enumerating objects: 15, done.
remote: Counting objects: 100% (15/15), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 8 (delta 7), reused 8 (delta 7), pack-reused 0
Unpacking objects: 100% (8/8), 630 bytes | 17.00 KiB/s, done.
From github.com:Trysupe/bslab
   b25d074..be2597f  master     -> origin/master
 * [new tag]         1.0        -> 1.0
Merge made by the 'recursive' strategy.
 includes/DMap.h    | 1 -
 includes/RootDir.h | 1 -
 src/DMap.cpp       | 5 -----
 src/RootDir.cpp    | 4 ----
 4 files changed, 11 deletions(-)

Felix Schneider@Asterix MINGW64 ~/OneDrive - bwedu/Studium/3. Semester/Betriebssysteme/bslab (master)
$ git push
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 16 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 354.11 KiB | 2.62 MiB/s, done.
Total 7 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 1 local object.
To github.com:Trysupe/bslab.git
   be2597f..bbfddcb  master -> master
felixschndr commented 3 years ago

Meldung kam nicht, da es nicht über diff gemacht wurde^^