Git錯誤non-fast-forward后的沖突解決

Git錯誤non-fast-forward后的沖突解決當要push代碼到git時，出現提示： error:failed to push some refs to ... Dealing with “non-fast-forward” errorsFrom time to time you ...