git错误non-fast-forward后的冲突解决

大佬教程收集整理的这篇文章主要介绍了git错误non-fast-forward后的冲突解决，大佬教程大佬觉得挺不错的，现在分享给大家，也给大家做个参考。

来自：https://www.linuxidc.com/Linux/2012-04/58985.htm 侵删

当要push代码到git时，出现提示：

error:failed to push some refs to ...

Dealing with “non-fast-forWARD” errors

To prevent you from losing history,non-fast-forWARD updates were rejected
WARD'
Help' for details.
HelR_907_11845@ing at first,do not fear. Simply put,git cAnnot make the change on the remote without losing commits,so it refuses the push. Usually this is caused by another user pushing to the same branch. You can remedy this by fetching and merging the remote branch,or using pull to perform both at once.
what you want to do. Force-pushes can cause issues for other users that have fetched the remote branch,and is considered bad practice. When in doubt,don’t force-push.