git提交时报错问题

 master -> master (non-fast-forward)
    error: failed to push some refs to 'https://github.com/shiren1118/iOS_code_agile.git'
    hint: Updates were rejected because the tip of your current branch is behind
    hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
    hint: before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解决办法

git push -u origin master -f 
 1,强推,即利用强覆盖方式用你本地的代码替代git仓库内的内容
   git push -f
2,先把git的东西fetch到你本地然后merge后再push
   $ git fetch origin
   $ git merge  origin/master
   $ git push origin master

你可能感兴趣的:(版本控制)