git pull后无法解决冲突 [英] Cannot solve conflicts after git pull

问题描述

文件已在本地和远程更改.

A file has been changed both locally and remotely.

我希望能够解决冲突.

但是，当我使用IntellilJ执行"git pull"时，会收到以下消息:"Git Pull失败.您的本地更改将被合并覆盖.提交，存储或还原它们以继续."

However when I execute a "git pull" with IntellilJ, I get the following message: "Git Pull Failed. Your local changes would be overwritten by merge. Commit, stash or revert them to proceed."

我需要怎么做才能将本地更改与远程更改合并，然后提交并推送?

What I need to do to merge the local changes with the remote changes, then commit and push?

推荐答案

对本地工作区中的内容进行提交，然后拉出.

Do a commit on the stuff you have in your local workspace, then pull.

这篇关于git pull后无法解决冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！