blocks|key|445034|text|错误信息：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|445035|合并:远程/主-我们不能合并的东西|blockquote|445036|是说吉特不认识remote/master。这可能是因为您没有一个名为"remote“的”远程“。你有一个叫“原产地”的“遥控器”。|offset|length|style|CODE|445037|将"remotes“作为Git服务器url的别名。master是您在本地签出的分支版本。origin/master是从您的Git服务器获取(下载)的master的最新版本。fetch总是安全的，因为它只更新分支的“原产地/x”版本。|445038|因此，要使您的master分支恢复同步，首先从git服务器下载最新内容：|445039|git+fetch|code-block|syntax|javascript|445040|然后，执行合并：|445041|git+merge+origin/master|445042|...But，也许更好的方法是：|445043|git+pull+origin+master|445044|pull命令将在一步内为您执行fetch和merge。|445045|entityMap^0|0|0|7|D|0|P|6|18|D|22|6|2E|5|0|7|6|0|0|0|0|0|0|0|4|F|5|L|5|0^^$0|@$1|2|3|4|5|6|7|15|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|16|8|@]|9|@]|A|$]]|$1|E|3|F|5|6|7|17|8|@$G|18|H|19|I|J]]|9|@]|A|$]]|$1|K|3|L|5|6|7|1A|8|@$G|1B|H|1C|I|J]|$G|1D|H|1E|I|J]|$G|1F|H|1G|I|J]|$G|1H|H|1I|I|J]]|9|@]|A|$]]|$1|M|3|N|5|6|7|1J|8|@$G|1K|H|1L|I|J]]|9|@]|A|$]]|$1|O|3|P|5|Q|7|1M|8|@]|9|@]|A|$R|S]]|$1|T|3|U|5|6|7|1N|8|@]|9|@]|A|$]]|$1|V|3|W|5|Q|7|1O|8|@]|9|@]|A|$R|S]]|$1|X|3|Y|5|6|7|1P|8|@]|9|@]|A|$]]|$1|Z|3|10|5|Q|7|1Q|8|@]|9|@]|A|$R|S]]|$1|11|3|12|5|6|7|1R|8|@$G|1S|H|1T|I|J]|$G|1U|H|1V|I|J]|$G|1W|H|1X|I|J]]|9|@]|A|$]]|$1|13|3|-4|5|6|7|1Y|8|@]|9|@]|A|$]]]|14|$]]

The error message: 

<blockquote>
 merge: remote/master - not something we can merge
</blockquote>

is saying that Git doesn't recognize <code>remote/master</code>. This is probably because you don't have a "remote" named "remote". You have a "remote" named "origin".

Think of "remotes" as an alias for the url to your Git server. <code>master</code> is your locally checked-out version of the branch. <code>origin/master</code> is the latest version of <code>master</code> from your Git server that you have fetched (downloaded). A <code>fetch</code> is always safe because it will only update the "origin/x" version of your branches.

So, to get your <code>master</code> branch back in sync, first download the latest content from the git server:

<pre><code>git fetch
</code></pre>

Then, perform the merge:

<pre><code>git merge origin/master
</code></pre>

...But, perhaps the better approach would be:

<pre><code>git pull origin master
</code></pre>

The <code>pull</code> command will do the <code>fetch</code> and <code>merge</code> for you in one step.

blocks|key|1454854|text|我遇到了同样的问题，当我读到这个错误时，我无法决定是笑还是在桌子上砸我的头。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1454855|git真正想告诉您的是：“您已经处于合并状态，需要首先解决冲突！”|1454856|您尝试了合并，然后发生了冲突。然后，git保持在合并状态，如果您想用其他命令解析合并，git认为您想要执行一个新的合并，因此它告诉您不能这样做，因为您当前未合并的文件.|1454857|您可以将此状态保留在git+merge+--abort中，然后尝试执行其他命令。|offset|length|style|CODE|1454858|在我的情况下，我尝试拉，并希望解决冲突时，手动发生错误。|1454859|entityMap^0|0|0|0|A|H|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|S|8|@$H|T|I|U|J|K]]|9|@]|A|$]]|$1|L|3|M|5|6|7|V|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|O|$]]

I ran into the same issue and couldn't decide between laughing or smashing my head on the table when I read this error...

What git really tries to tell you: "You are already in a merge state and need to resolve the conflicts there first!"

You tried a merge and a conflict occured. Then, git stays in the merge state and if you want to resolve the merge with other commands git thinks you want to execute a new merge and so it tells you you can't do this because of your current unmerged files...

You can leave this state with <code>git merge --abort</code> and now try to execute other commands.

In my case I tried a pull and wanted to resolve the conflicts by hand when the error occured...

blocks|key|5141571|text|我也曾多次遇到过同样的挑战。此问题主要发生在您试图从远程存储库中提取并且本地实例上的一些文件与远程版本冲突时，如果您使用的是来自IDE+(如IntelliJ+)的git，如果您希望保留自己的更改，或者希望远程版本中的更改覆盖您的更改，则将提示并允许您做出选择。如果你不做任何选择，你就会陷入这场冲突。您所需要做的就是运行：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|5141572|git+merge+--abort+#+The+unresolved+conflict+will+be+cleared+off|code-block|syntax|javascript|5141573|你可以继续你在休息前做的事。|5141574|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

I repeatedly had the same challenge sometime ago. This problem occurs mostly when you are trying to pull from the remote repository and you have some files on your local instance conflicting with the remote version, if you are using git from an IDE such as IntelliJ, you will be prompted and allowed to make a choice if you want to retain your own changes or you prefer the changes in the remote version to overwrite yours'. If you don't make any choice then you fall into this conflict. all you need to do is run:

<pre><code>git merge --abort # The unresolved conflict will be cleared off
</code></pre>

And you can continue what you were doing before the break.

blocks|key|445080|text|造成这种情况的另一个潜在原因(Intellij与我的案例有关，但不确定这一点是否重要)：尝试将更改从主分支合并到特性分支的分支中。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|445081|换言之，将"main“合并为"current”的安排如下：|445082|main
++%7C
++--feature
++++++%7C
++++++--current|code-block|syntax|javascript|445083|我解决了所有冲突，GiT报告了未合并的文件，直到我从main合并到特性，然后将特性合并到current。|445084|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|O|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|P|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

Another potential cause for this (Intellij was involved in my case, not sure that mattered though): trying to merge in changes from a main branch into a branch off of a feature branch. 

In other words, merging "main" into "current" in the following arrangement:

<pre><code>main
 |
 --feature
 |
 --current
</code></pre>

I resolved all conflicts and GiT reported unmerged files and I was stuck until I merged from main into feature, then feature into current.

blocks|key|5141633|text|可能是未合并的路径导致了|type|unstyled|depth|inlineStyleRanges|entityRanges|data|5141634|error:+Merging+is+not+possible+because+you+have+unmerged+files.|code-block|syntax|javascript|5141635|如果是，试着：|5141636|git+status|5141637|如果上面写着|5141638|你有未合并的路径。|blockquote|5141639|按建议执行:要么解决冲突，然后提交或完全中止合并|5141640|git+merge+--abort|5141641|您还可能会看到未合并路径下列出的文件，您可以通过以下操作解析这些文件|5141642|git+rm+<file>|5141643|entityMap^0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|10|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|11|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|12|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|13|8|@]|9|@]|A|$]]|$1|M|3|N|5|O|7|14|8|@]|9|@]|A|$]]|$1|P|3|Q|5|6|7|15|8|@]|9|@]|A|$]]|$1|R|3|S|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|T|3|U|5|6|7|17|8|@]|9|@]|A|$]]|$1|V|3|W|5|D|7|18|8|@]|9|@]|A|$E|F]]|$1|X|3|-4|5|6|7|19|8|@]|9|@]|A|$]]]|Y|$]]

It might be the Unmerged paths that cause
<pre><code>error: Merging is not possible because you have unmerged files.
</code></pre>
If so, try:
<pre><code>git status
</code></pre>
if it says
<blockquote>
You have unmerged paths.
</blockquote>
do as suggested: either resolve conflicts and then commit or abort the merge entirely with
<pre><code>git merge --abort
</code></pre>
You might also see files listed under Unmerged paths, which you can resolve by doing
<pre><code>git rm &lt;file&gt;
</code></pre>

blocks|key|1457352|text|我也有类似的问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1457353|我的问题是:当我合并分支并解决与IDE的冲突时，IDE将正常显示提交面板，但它不显示。|1457354|我认为我已经成功地合并了，但是当我推或拉时，git提醒我“在合并之前提交您的更改”或“由于您当前分支的提示已经落后而拒绝更新”。|1457355|我的解决方案：git+merge+--continue|offset|length|style|CODE|1457356|如果要中止此合并，还可以运行git+merge+--abort。|1457357|entityMap^0|0|0|0|7|K|0|E|H|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|S|8|@$H|T|I|U|J|K]]|9|@]|A|$]]|$1|L|3|M|5|6|7|V|8|@$H|W|I|X|J|K]]|9|@]|A|$]]|$1|N|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|O|$]]

I also had similar problems.
My probblem: when I merge branch, and resolve conflicts with IDE, the IDE will show commit panel board normally, but it does not.
I think I have merged successfully, but when I push or pull，git remind me &quot; commit your changes before merging&quot; or &quot;Updates were rejected because the tip of your current branch is behind&quot;.
My solution: <code>git merge --continue</code>
if you want to abort this merge ,you can also run <code>git merge --abort</code>

blocks|key|445214|text|在我身上发生了一些事情，如果您之前试图进行合并，并解决了传入分支上的一些冲突，git可以在当前分支上自己进行一些更改，因此，尝试git+status，即使您确信自己没有做过任何修改，那么可能会出现这样的情况：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|445215|📷|atomic|445216|​|445217|然后只需执行git+add+.+git+commit+-m+"message"并再次尝试进行合并。|445218|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/0fad155aeb670ded291e1727edaf23e6.png|imageAlt^0|1S|A|0|0|1|0|0|0|6|9|G|N|0^^$0|@$1|2|3|4|5|6|7|V|8|@$9|W|A|X|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Y|8|@]|D|@$9|Z|A|10|1|11]]|E|$]]|$1|I|3|J|5|6|7|12|8|@]|D|@]|E|$]]|$1|K|3|L|5|6|7|13|8|@$9|14|A|15|B|C]|$9|16|A|17|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|18|8|@]|D|@]|E|$]]]|N|$O|$5|P|Q|R|E|$S|T|U|-4]]]]

Something that happened to me, if you tried to do merge before and resolved some conflicts on the incoming branch, git can do some changes on its own on your current branch, so try <code>git status</code> even if you are sure that no modifications have been made by yourself, then something like this might appear:
<a href="https://i.stack.imgur.com/aqa2e.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/aqa2e.png" alt="They did it!" /></a>
then simply do <code>git add .</code> <code>git commit -m &quot;message&quot;</code> and try to do the merge again

blocks|key|445250|text|简单的方法是在终端窗口/cmd中键入git+status。这将显示需要添加或删除的文件。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|445251|📷|atomic|445252|​|445253|然后，您可以执行git+add，然后是文件路径，或者用git+rm删除它们，也可以是文件路径。|445254|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/82b29dcadc3f60525b183a430bc2bc5f.png|imageAlt^0|I|A|0|0|1|0|0|0|8|7|R|6|0^^$0|@$1|2|3|4|5|6|7|V|8|@$9|W|A|X|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Y|8|@]|D|@$9|Z|A|10|1|11]]|E|$]]|$1|I|3|J|5|6|7|12|8|@]|D|@]|E|$]]|$1|K|3|L|5|6|7|13|8|@$9|14|A|15|B|C]|$9|16|A|17|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|18|8|@]|D|@]|E|$]]]|N|$O|$5|P|Q|R|E|$S|T|U|-4]]]]

The simple way is type <code>git status</code> into your terminal window/cmd.
This should show you the files that either need to be added or removed
<a href="https://i.stack.imgur.com/Q8Q6c.png" rel="noreferrer"><img src="https://i.stack.imgur.com/Q8Q6c.png" alt="enter image description here" /></a>
and then you can either do <code>git add</code> followed by the file path
or remove them with <code>git rm</code> also followed by the file path.

blocks|key|5141854|text|试一试|type|unstyled|depth|inlineStyleRanges|entityRanges|data|5141855|git+add+*
git+commit+-comment
git+pull|code-block|syntax|javascript|5141856|说明git+*：意味着要添加所有未添加的文件‘git提交-comment+:您正在提交文件，您刚刚添加了git拉:您现在正在从在线版本中获得更改|5141857|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

try
<pre><code>git add *
git commit -comment
git pull
</code></pre>
<hr />
Explanation
git add * : Means you are adding all files that are not added'
git commit -comment : You are committing file you have just added
git pull : You are now getting changes from online version

blocks|key|1457427|text|我设法用这些git命令解决了这个问题，以便：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1457428|git+init+++
git+rm+-r+-f+*++
git+merge+origin+main++
git+add+*++
git+commit+-m+'merging'++
git+pull|code-block|syntax|javascript|1457429|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

I managed to resolve this issue with these git commands in order:
<pre><code>git init 
git rm -r -f * 
git merge origin main 
git add * 
git commit -m 'merging' 
git pull
</code></pre>

git continues to confuse me with its unhelpful error warnings This one really deserves a prize:

<pre><code>git merge is not possible because you have unmerged files
</code></pre>

My situation: My master branch on github was edited (directly in the browser) while my local master branch was also edited.

I wrongly suppose you could simply merge the two versions and be done with it, but also, I cannot merge - because my files are unmerged.

<pre><code>git merge remote/master
</code></pre>

results in

<pre><code>error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
</code></pre>

So, after adding and committing the local change and then trying to merge again, I get:

<pre><code>merge: remote/master - not something we can merge
</code></pre>

Clearly I am missing something essential here... Do I have the wrong idea about what merging means? How do I fix this issue of having a different remote master / local master branch?

Git merge is not possible because I have unmerged files

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

git继续把我和它的无益错误警告混淆在一起，这个错误警告确实值得奖励：git merge is not possible because you have unmerged files我的情况:我在github上的主分支被编辑(直接在浏览器中)，而我的本地主分支也被编辑了。我错误地认为您可以简单地合并这两个版本并完成它...

问不可能进行Git合并，因为我有未合并的文件。
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问不可能进行Git合并，因为我有未合并的文件。EN