我试图将我的文件推入git,但它不起作用。Git推-u原点大师
这是我以前做过的。
git init
git add .
git commit -m "Start"
git remote add origin [email protected]:user/repo.git
第一个git push -u origin master
的作品。
更改一些文件并尝试git push -u origin master
再次 它不起作用。
To [email protected]:denis89/gaw8d3.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:denis89/gaw8d3.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.
此外,由于未合并的文件,git pull不起作用。 任何想法?
我发现如何解决它感谢Trev Norris:http://stackoverflow.com/questions/15127078/git-pull-is-not-possible-unmerged-files –