Here is what I have done:
Jaspernetwork:~ Jasper$ cd ~/GitHubHelloWorld Jaspernetwork:GitHubHelloWorld Jasper$ ls README.md Readme.txt Jaspernetwork:GitHubHelloWorld Jasper$ cat < Readme.txt Jaspernetwork:GitHubHelloWorld Jasper$ git push warning: push.default is unset; its implicit value is changing in Git 2.0 from matching to simple . To squelch this message and maintain the current behavior after the default changes, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to matching , git will push local branches to the remote branches that already exist with the same name.
In Git 2.0, Git will default to the more conservative simple behavior, which only pushes the current branch to the corresponding remote branch that git pull uses to update the current branch.
See git help config and search for push.default for further information. (the simple mode was introduced in Git 1.7.11. Use the similar mode
current instead of simple if you sometimes use older versions of Git)
https://github.com/Napoleon1769/HelloWorld.git https://github.com/Napoleon1769/HelloWorld.git
! [rejected] master -> master (non-fast-forward)
https://github.com/Napoleon1769/HelloWorld.git https://github.com/Napoleon1769/HelloWorld.git hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: git pull ... ) before pushing again. hint: See the Note about fast-forwards in git push --help for details. Jaspernetwork:GitHubHelloWorld Jasper$
I then pulled and then committed however the following response came up:
Jaspernetwork:GitHubHelloWorld Jasper$ git pull You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge. Jaspernetwork:GitHubHelloWorld Jasper$ git commit
the commit.
It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again. Please enter the commit message for your changes. Lines starting
with # will be ignored, and an empty message aborts the commit.
On branch master All conflicts fixed but you are still merging.
Changes to be committed:
new file: README.md
~
~ enter code here
~
~
~
-- INSERT --
