CODEWITHSUNDEEP
gitmerge
beginner
beginner

Reputation: 299

Merge branch 'master'

Beginner: I was trying to do "pull" before a "push" of my new file to GitHub as system asked. When I typed git push it showed me:

Merge branch 'master' of https://github.com/Wordworth/Test2
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
~                                                                               
-- INSERT --

What to do with this? the goal is to push my file after commit to GitHub repo which already exists with the same name is local one. Any hints?

Upvotes: 3

Views: 3476

Answers (1)

Don Branson
Don Branson

Reputation: 13709

This is normal behavior. It's merging the remote contents with your local contents. Save this commit message, and the pull will complete. Then issue your push.

git pull does two things behind the scenes - first, a fetch to pull all the contents from the remote repo, then a merge of the remote contents of the current branch with your local contents.

That file you're seeing is a suggested message for the commit of the merge results.

Upvotes: 5

Related Questions