V
V
vsespb2013-07-08 22:40:57
git
vsespb, 2013-07-08 22:40:57

Merge the remote changes before pushing again even though there were no remote changes

$ git push
Counting objects: 5, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 1.58 KiB, done.
Total 3 (delta 2), reused 0 (delta 0)
To https://github.com/my/repo.git
   6317d42..d9b787e  development -> development



in 15 minutes

$ git push
To https://github.com/my/repo.git
 ! [rejected]        development -> development (non-fast-forward)
error: failed to push some refs to 'https://github.com/my/repo.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.
$ git push
To https://github.com/my/repo.git
 ! [rejected]        development -> development (non-fast-forward)
error: failed to push some refs to 'https://github.com/my/repo.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.
$ git pull
Merge made by recursive.
$ git push
Counting objects: 16, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.42 KiB, done.
Total 11 (delta 9), reused 0 (delta 0)
To https://github.com/my/repo.git
   d9b787e..2b694e8  development -> development


at the same time, there were no changes on the github, no one has access, and now in the history of changes it is not visible that someone made a commit.

But there is a merge commit "Merge branch 'development'" in which there are no changes
Showing 0 changed files with 0 additions and 0 deletions.

The question is why does this happen?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
J
jcmvbkbc, 2013-07-08
@jcmvbkbc

Judging by the last lines of the logs of the first and second push
6317d42.. d9b787e development -> development
d9b787e ..2b694e8 development -> development
, the github repository has not changed. Perhaps the local copy of development has changed?
merge commit and will not contain any changes if the merge went through without conflicts.
Look at git log --graph to see what you actually merged.

V
vsespb, 2013-07-09
@vsespb

del

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question