git提交代码问题解决

问题：

 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/NULLcaption/project.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.

核心问题：

Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g.’git pull …’) before pushing again.

其实质就是本地代码和远程代码仓库的项目不一致，解决这个问题，有以下几种办法：
1.使用强制push的方法：

$ git push -u origin master -f

这样会使远程修改丢失，一般是不可取的，尤其是多人协作开发的时候。

2.push前先将远程repository修改pull下来

$ git pull origin master

$ git push -u origin master

3.若不想merge远程和本地修改，可以先创建新的分支：

$ git branch [name]

然后push

$ git push -u origin [name]