git: Why "Merge branch 'master' of ... "? when pull and push

git git-push git-pull git-commit
Nullptr picture Nullptr · Mar 15, 2013 · Viewed 35k times · Source

I'm still git newbie. I modified some source files and committed. Then, I did git push. But, I got this error.

To /foo/bar/  ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '/foo/bar/' 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.

This reject seems that I didn't git pull before push. So, I did git pull. Okay, there were two modified files by others.

Then, I was able to git push successfully.

Question: In this case, I'm seeing one more log like following with my original commit message:

commit 59e04ce13b8afa...
Merge: 64240ba 76008a5
Author: Jone Doe <[email protected]>
Date:   Fri Mar 15 11:08:55 2013 -0700

    Merge branch 'master' of /foo/bar/

And this is my original commit message.

commit 64240bafb07705c...
Author: Jone Doe <[email protected]>
Date:   Fri Mar 15 11:06:18 2013 -0700

    Fixed bugs and updated!

I'd like to understand why "merge branch master of location" is added.

Answer

r.v picture r.v · Mar 15, 2013

When you did a git-pull, modifications from the remote branch were merged into your local branch. The automatically generated commit signifies that.

Merging could have resulted in conflicts, which would then need to be resolved manually. In your particular case, this did not happen and git could take care of everything.

Related questions

Git pull from someone else's fork

We are two students working on our online repository (different repo) that is forked from a common upstream repo. Let's say other student made Changes, Commits and Pushed to his repo on a specific branch. How do I pull these …

Read More
git push rejected: error: failed to push some refs

I know people have asked similar questions, but I believe the causes of their problems to be different. I did a hard reset because I had messed up my code pretty bad git reset --hard 41651df8fc9 I've made quite …

Read More
Push branches to Git

I have a local repository I'm working on and its remote is hosted on GitHub. I recently created a branch and started working on it, making several commits and now wish to push the branch to GitHub and be able …

Read More