git提交代码从reject到提交成功全过程1.问题重述2.解决过程出现新问题：Yourlocalchangestothefollowingfileswouldbeoverwrittenbymerge出现新问题：Mergingisnotpossiblebecauseyouhaveunmergedfiles出现新问题：SystemMeanageService爆红出现新问题：Youhavenotconcludedyourmerge(MERGE_HEADexists).这里是不断发芽的山有木兮，希望这个帖子可以帮到你！1.问题重述git提交出现“updateswererejectedbecausea

Git本地代码推送到线上出现的问题错误信息为：error:failedtopushsomerefsto'http://**:**/**/**.git'hint:UpdateswererejectedbecausethetipofyourcurrentbranchisbehindTohttp://**:**/**/**.git! refs/heads/master:refs/heads/master [rejected](non-fast-forward)Donehint:itsremotecounterpart.Integratetheremotechanges(e.g.hint:'gitpu

Git本地代码推送到线上出现的问题错误信息为：error:failedtopushsomerefsto'http://**:**/**/**.git'hint:UpdateswererejectedbecausethetipofyourcurrentbranchisbehindTohttp://**:**/**/**.git! refs/heads/master:refs/heads/master [rejected](non-fast-forward)Donehint:itsremotecounterpart.Integratetheremotechanges(e.g.hint:'gitpu