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

Git错误non-fast-forward后的冲突解决当要push代码到git时，出现提示： error:failed to push some refs to ... Dealing with ...