我和我的朋友对同一个分支进行了更改,他推进了它,过了一段时间,我试图做同样的事情,但我得到了。但我得到错误说:解决合并冲突后无法推送
error: failed to push some refs to '<repo_name>'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
所以我做了一个从远程分支拉并解决合并冲突。
但在那之后,当我试图把从我和我的朋友已经远程包括改变它说:
Everything up-to-date
,但我的变化仍然没有反映在远程回购。我在这里错过了什么?
解决冲突后又添加并提交了吗? –
yup!我做了男人。 @sajibkhan – blueChair