当前位置: 代码迷 >> 综合 >> IDEA git提交代码 push reject push of current branch XX was reject remote changes need to be merged
  详细解决方案

IDEA git提交代码 push reject push of current branch XX was reject remote changes need to be merged

热度:23   发布时间:2024-02-26 10:39:16.0

push reject

push of current branch XX was reject

remote changes need to be merged before pushing.

我的问题是提交了本机的配置文件,与远程代码有冲突

可以先merge,然后看看修改的文件,再把本机的配置文件改回来,下次提交不要再提交配置文件了

或者可以暴力合并远程代码,相当于覆盖,不推荐,特别是多人合作的

  相关解决方案