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

    科技2025-06-01  40

    push reject

    push of current branch XX was reject

    remote changes need to be merged before pushing.

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

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

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

    Processed: 0.010, SQL: 8