blocks|key|89597|text|如How+does+"not+something+we+can+merge"+arise?所示，此错误可能是由于分支名称中的拼写错误引起的，因为您正在尝试拉出一个不存在的分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|89598|如果这不是问题所在(就像我的例子一样)，那么很可能您没有要合并的分支的本地副本。Git需要两个分支的本地知识才能合并这些分支。您可以通过检出要合并的分支，然后返回到要合并到的分支来解决此问题。|89599|git+checkout+branch-name
git+checkout+master
git+merge+branch-name|code-block|syntax|javascript|89600|这应该是有效的，但是如果您收到一个错误，说明|89601|error:+pathspec+'remote-name/branch-name'+did+not+match+any+file(s)+known+to+git.|89602|在检出分支之前，您需要获取远程(可能，但不一定是“源”)：|89603|git+fetch+remote-name|89604|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/14388625/how-does-not-something-we-can-merge-arise^0|1|18|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@$A|11|B|12|1|13]]|C|$]]|$1|D|3|E|5|6|7|14|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|15|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|16|8|@]|9|@]|C|$]]|$1|M|3|N|5|H|7|17|8|@]|9|@]|C|$I|J]]|$1|O|3|P|5|6|7|18|8|@]|9|@]|C|$]]|$1|Q|3|R|5|H|7|19|8|@]|9|@]|C|$I|J]]|$1|S|3|-4|5|6|7|1A|8|@]|9|@]|C|$]]]|T|$U|$5|V|W|X|C|$Y|Z]]]]

As shown in <a href="https://stackoverflow.com/questions/14388625/how-does-not-something-we-can-merge-arise">How does &quot;not something we can merge&quot; arise?</a>, this error can arise from a typo in the branch name because you are trying to pull a branch that doesn't exist.

If that is not the problem (as in my case), it is likely that you don't have a local copy of the branch that you want to merge. Git requires local knowledge of both branches in order to merge those branches. You can resolve this by checking out the branch to merge and then going back to the branch you want to merge into.

<pre><code>git checkout branch-name
git checkout master
git merge branch-name
</code></pre>

This should work, but if you receive an error saying

<pre><code>error: pathspec 'remote-name/branch-name' did not match any file(s) known to git.
</code></pre>

you need to fetch the remote (probably, but not necessarily, "origin") before checking out the branch:

<pre><code>git fetch remote-name
</code></pre>

blocks|key|306619|text|这是一个愚蠢的建议，但请确保分支名称中没有拼写错误！|type|unstyled|depth|inlineStyleRanges|entityRanges|data|306620|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

It's a silly suggestion, but make sure there is no typo in the branch name!

blocks|key|89641|text|当我执行git+merge+BRANCH_NAME+"some+commit+message"时，我得到了这个错误-我忘记为提交消息添加-m标志，所以它认为分支名称包含注释。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|89642|entityMap^0|4|17|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

I got this error when I did a <code>git merge BRANCH_NAME "some commit message"</code> - I'd forgotten to add the -m flag for the commit message, so it thought that the branch name included the comment.

blocks|key|306689|text|如果包含引用的字符串是由另一个Git命令(或任何其他shell命令)生成的，请确保它的末尾不包含回车符。在将字符串传递给"git+merge“之前，您必须剥离它。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|306690|注意，当这种情况发生时，这是非常明显的，因为错误消息在两行中：|306691|merge:+26d8e04b29925ea5b59cb50501ab5a14dd35f0f9
+-+not+something+we+can+merge|code-block|syntax|javascript|306692|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

If the string containing the reference is produced by another Git command (or any other shell command for that matter), make sure that it doesn't contain a return carriage at the end. You will have to strip it before passing the string to "git merge".

Note that it's pretty obvious when this happens, because the error message in on 2 lines:

<pre><code>merge: 26d8e04b29925ea5b59cb50501ab5a14dd35f0f9
 - not something we can merge
</code></pre>

blocks|key|89698|text|我也有这个问题。分支看起来像'username/master‘，这似乎让git感到困惑，因为它看起来像是我定义的远程地址。对于我来说，使用这个|type|unstyled|depth|inlineStyleRanges|entityRanges|data|89699|git+merge+origin/username/master|code-block|syntax|javascript|89700|工作得很好。|89701|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 had this issue as well. The branch looked like 'username/master' which seemed to confuse git as it looked like a remote address I defined. For me using this

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

worked perfectly fine.

blocks|key|89728|text|对于子孙后代:就像AxeEffect说的那样。如果您没有输入错误，请检查您的本地分支机构名称中是否有可笑的字符，如逗号或撇号。这就是刚才发生在我身上的事情。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|89729|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

For posterity: Like AxeEffect said... if you have no typos check to see if you have ridiculous characters in your local branch name, like commas or apostrophes. Exactly that happened to me just now.

blocks|key|306854|text|当从远程上游拉取时，git+fetch+--all为我做了这个把戏：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|306855|git+remote+add+upstream+[url+to+the+original+repo]
git+checkout+[branch+to+be+updated]
git+fetch+--all
git+merge+upstream/[branch+to+be+updated]|code-block|syntax|javascript|306856|在其他情况下，我发现如果远程(原始，上游)分支不存在，也会出现"Not+something+we+can+merge“错误。这似乎很明显，但您可能会发现自己在只有master的存储库上执行git+merge+origin/develop。|306857|entityMap^0|A|F|0|0|29|6|2M|O|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|R|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|S|8|@$9|T|A|U|B|C]|$9|V|A|W|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|X|8|@]|D|@]|E|$]]]|N|$]]

When pulling from a remote upstream, <code>git fetch --all</code> did the trick for me:

<pre><code>git remote add upstream [url to the original repo]
git checkout [branch to be updated]
git fetch --all
git merge upstream/[branch to be updated]
</code></pre>

In other cases, I found the "Not something we can merge" error will also happen if the remote (origin, upstream) branch does not exist. This might seem obvious, but you might find yourself doing <code>git merge origin/develop</code> on a repo that only has <code>master</code>.

blocks|key|306895|text|我建议检查您是否能够切换到您尝试合并的分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|306896|即使我想要合并的分支在本地存储库中，并且没有拼写错误，我也得到了这个错误。|306897|我忽略了本地更改，以便可以切换到分支(也可以首选Stash或commit+)。在此之后，我切换回初始分支，合并成功。|306898|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|H|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|I|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|J|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|G|$]]

I suggest checking if you are able to switch to the branch that you are trying to merge with.

I got this error even though the branch I wanted to merge with was in local repository and there were no spelling errors.

I ignored my local changes so that I could switch to the branch (Stash or commit can also be preferred). After this I switched back to the initial branch, and the merge was successful.

blocks|key|306906|text|您会收到此错误，因为您想要合并的分支在本地存储库中不存在。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|306907|因此，首先通过以下命令签出要合并到主分支中的分支：|306908|git+checkout+branch_name_to_merge|code-block|syntax|javascript|306909|在此之后，尝试使用以下命令将其与主分支合并：|306910|git+merge+branch_name_to_merge|306911|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Q|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|S|8|@]|9|@]|A|$G|H]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

You are getting this error because the branch you want to merge doesn't exist on your local repository. 

So, first checkout the brach you want to merge into master branch by the following command: 

<pre><code>git checkout branch_name_to_merge
</code></pre>

After this try to merge it with master branch by the following command: 

<pre><code>git merge branch_name_to_merge
</code></pre>

blocks|key|89856|text|我们得到这个错误是因为分支名称中有一个逗号(，)。我们删除了本地分支，然后用不带逗号的新名称重新检查它。我们能够成功地合并它。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|89857|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

We got this error because we had a comma (,) in the branch name. We deleted the local branch, then re-checked it under a new name without the comma. We were able to merge it successfully.

blocks|key|89892|text|对于我来说，这个问题发生在我尝试这样做的时候：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|89893|git+merge+-s+ours+--no-commit+--allow-unrelated-histories+<remote+name>/develop|code-block|syntax|javascript|89894|所以实际上我应该写master而不是develop，因为master是子树的分支名称，而不是我实际的分支。|offset|length|style|CODE|89895|entityMap^0|0|0|9|6|I|7|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]|$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

For me the problem occured when I tried this:

<pre><code>git merge -s ours --no-commit --allow-unrelated-histories &lt;remote name&gt;/develop
</code></pre>

So actually I should have written <code>master</code> instead of <code>develop</code>,because master was the branch name of Subtree,not my actual branch.

blocks|key|307005|text|这可能是因为该分支不在本地。在合并使用之前|type|unstyled|depth|inlineStyleRanges|entityRanges|data|307006|git+fetch+origin|code-block|syntax|javascript|307007|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|$]]

It may happen because that branch is not on your local. before merging use

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

blocks|key|89956|text|这个错误表明您想要合并更改的分支(例如，在您的本地中不存在分支名称)，所以您应该签出该分支并获取本地更改。签出到您的主分支并获取，然后执行以下步骤：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|89957|git+checkout+branch-name
git+pull
git+checkout+new-branch-name
git+merge+branch-name|code-block|syntax|javascript|89958|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|$]]

This error suggest that the branch from where you want to merge changes (i.e. in you case branch-name) is not present in you local, so you should checkout the branch and fetch the local changes.
Checkout to your master branch and fetch, then follow the below steps:

<pre><code>git checkout branch-name
git pull
git checkout new-branch-name
git merge branch-name
</code></pre>

blocks|key|89989|text|下面的方法每次都适用于我。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|89990|git+checkout+master
git+pull
git+checkout+branch-name-to-be-merged
git+pull
git+checkout+branch-name
git+pull
git+merge+branch-name-to-be-merged|code-block|syntax|javascript|89991|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|$]]

The below method works for me every time.

<pre><code>git checkout master
git pull
git checkout branch-name-to-be-merged
git pull
git checkout branch-name
git pull
git merge branch-name-to-be-merged
</code></pre>

blocks|key|90023|text|这可能听起来很奇怪，但是记住设置你的git邮箱和名字：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|90024|git+config+--global+user.email+"MY@EMAIL.COM"
git+config+--global+user.name+"FIRST_NAME+LAST_NAME"|code-block|syntax|javascript|90025|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|$]]

This may sounds weird, but remember to setup your git email and name:

<pre><code>git config --global user.email "MY@EMAIL.COM"
git config --global user.name "FIRST_NAME LAST_NAME"
</code></pre>

blocks|key|90041|text|在我看来，我错过了将我的本地分支映射到远程repo。我在下面这样做了，它工作得很好。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|90042|git+checkout+master
git+remote+add+origin+https://github.com/yourrepo/project.git
git+push+-u+origin+master
git+pull
git+merge+myBranch1FromMain|code-block|syntax|javascript|90043|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|$]]

In my opinion i had missed to map my local branch with remote repo. i did below and it worked fine.

<pre><code>git checkout master
git remote add origin https://github.com/yourrepo/project.git
git push -u origin master
git pull
git merge myBranch1FromMain
</code></pre>

blocks|key|90084|text|对我来说，问题在于合并消息中的“双引号”。所以当我去掉双标记的时候，一切都变得神奇了。我希望能帮助一些人。(对不起，我的英语很差)|type|unstyled|depth|inlineStyleRanges|entityRanges|data|90085|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

For me, the problem was the 'double quotation marks' into merge message. So when I removed the double mark, all magically worked. I hope to help someone. (Sorry for my poor English)

blocks|key|90130|text|我在两个不同的工作文件夹中签出了一个包含master和另一个分支的工作树。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|90131|PS+C:\rhipheusADO\Build>+git+worktree+list
C:/rhipheusADO/Build+++++++++7d32e6e+[vyas-cr-core]
C:/rhipheusADO/Build-master++91d418c+[master]

PS+C:\rhipheusADO\Build>+cd+..\Build-master\

PS+C:\rhipheusADO\Build-master>+git+merge+7d32e6e+#Or+any+other+intermediary+commits
Updating+91d418c..7d32e6e
Fast-forward
+Pipeline/CR-MultiPool/azure-pipelines-auc.yml+%7C+5+%2B%2B%2B--
+1+file+changed,+3+insertions(%2B),+2+deletions(-)

PS+C:\rhipheusADO\Build-master>+git+ls-remote
From+https://myorg.visualstudio.com/HelloWorldApp/_git/Build
53060bac18f9d4e7c619e5170c436e6049b63f25++++++++HEAD
7d32e6ec76d5a5271caebc2555d5a3a84b703954++++++++refs/heads/vyas-cr-core+

PS+C:\rhipheusADO\Build-master>+git+merge+7d32e6ec76d5a5271caebc2555d5a3a84b703954
Already+up-to-date

PS+C:\rhipheusADO\Build>++git+push
Total+0+(delta+0),+reused+0+(delta+0)
To+https://myorg.visualstudio.com/HelloWorldApp/_git/Build
+++91d418c..7d32e6e++master+->+master|code-block|syntax|javascript|90132|如果您只需要合并最新的提交：|90133|git+merge+origin/vyas-cr-core+
git+push|90134|和我一直做的一样：|90135|git+checkout+master+#+This+is+needed+if+you're+not+using+worktrees
git+pull+origin+vyas-cr-core
git+push|90136|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

I had a work tree with master and an another branch checked out in two different work folders.

<pre><code>PS C:\rhipheusADO\Build&gt; git worktree list
C:/rhipheusADO/Build 7d32e6e [vyas-cr-core]
C:/rhipheusADO/Build-master 91d418c [master]

PS C:\rhipheusADO\Build&gt; cd ..\Build-master\

PS C:\rhipheusADO\Build-master&gt; git merge 7d32e6e #Or any other intermediary commits
Updating 91d418c..7d32e6e
Fast-forward
 Pipeline/CR-MultiPool/azure-pipelines-auc.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

PS C:\rhipheusADO\Build-master&gt; git ls-remote
From https://myorg.visualstudio.com/HelloWorldApp/_git/Build
53060bac18f9d4e7c619e5170c436e6049b63f25 HEAD
7d32e6ec76d5a5271caebc2555d5a3a84b703954 refs/heads/vyas-cr-core 

PS C:\rhipheusADO\Build-master&gt; git merge 7d32e6ec76d5a5271caebc2555d5a3a84b703954
Already up-to-date

PS C:\rhipheusADO\Build&gt; git push
Total 0 (delta 0), reused 0 (delta 0)
To https://myorg.visualstudio.com/HelloWorldApp/_git/Build
 91d418c..7d32e6e master -&gt; master
</code></pre>

If you need to just merge the latest commit:

<pre><code>git merge origin/vyas-cr-core 
git push
</code></pre>

And is same as what I've always done:

<pre><code>git checkout master # This is needed if you're not using worktrees
git pull origin vyas-cr-core
git push
</code></pre>

blocks|key|90178|text|您尝试合并的分支目前可能无法被git识别，因此执行git+branch并查看您要合并的分支是否存在，如果不存在，则执行git+pull，现在如果您执行git+branch，分支现在将可见，现在您执行git+merge+<BranchName>|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|90179|entityMap^0|P|A|1N|8|23|A|2R|M|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]|$9|M|A|N|B|C]|$9|O|A|P|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|G|$]]

The branch which you are tryin to merge may not be identified by you git at present
so perform 
<code>git branch</code>
 and see if the branch which you want to merge exists are not, if not then perform 
<code>git pull</code> 
and now if you do <code>git branch</code>, the branch will be visible now, 
and now you perform <code>git merge &lt;BranchName&gt;</code>

blocks|key|90214|text|如果您没有使用origin关键字，并且分支不是您自己的分支，您也可能会遇到此错误。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|90215|git+checkout+<to-branch>+
git+merge+origin/<from-branch>|code-block|syntax|javascript|90216|entityMap^0|7|6|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|P|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|L|$]]

You might also encounter this error if you are not using <code>origin</code> keyword and the branch isn't one of your own.
<pre><code>git checkout &lt;to-branch&gt; 
git merge origin/&lt;from-branch&gt;
</code></pre>

blocks|key|90261|text|在我的例子中，问题出在分支名称上。我的新分支名称包含括号，一旦我重命名并删除括号，它就会排序。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|90262|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

In My case, the Problem was in Branch Name. My new branch name contains brackets, Once I renamed it and remove brackets, It's sorted.

blocks|key|307360|text|我也有同样的问题。我是一个完全的初学者，在我的例子中，它的发生是因为我试图这样做：git+merge+random_branch/file.txt当我停用file.txt并让分支名称(lol)+kkfdskfskdfs时，我的问题就解决了|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|307361|git+merge+random_branch运行得相当好|307362|entityMap^0|15|W|0|0|N|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|P|8|@]|D|@]|E|$]]]|I|$]]

I had the same problem... I am a complete beginner
In my case it happened cause I was trying to do: <code>git merge random_branch/file.txt</code>
My problem was solved when I retired the file.txt and let just the branch name (lol) kkfdskfskdfs
<code>git merge random_branch</code> worked pretty well

blocks|key|307384|text|我也有同样的问题。我用下面的命令修复了这个问题：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|307385|git+checkout+main
git+fetch
git+checkout+branch_name
git+fetch
git+checkout+main
git+fetch
git+merge+branch_name|code-block|syntax|javascript|307386|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 had the same problem. I fixed it using the command below:
<pre><code>git checkout main
git fetch
git checkout branch_name
git fetch
git checkout main
git fetch
git merge branch_name
</code></pre>

blocks|key|307402|text|我知道现在回答有点晚了，但我也面临着同样的问题，所以我运行了以下命令|type|unstyled|depth|inlineStyleRanges|entityRanges|data|307403|git+checkout+master|code-block|syntax|javascript|307404|然后|307405|git+pull+origin+branch-name|307406|它解决了我的问题|307407|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

I know it is late to answer but I also faced the same issue so I ran following commands
<pre><code>git checkout master
</code></pre>
and then
<pre><code>git pull origin branch-name
</code></pre>
It solved my problem

blocks|key|307439|text|我有这个问题，当我今天合并另一个分支到我的后，直接从主拉，我必须签出和拉我正在合并的分支首先，然后我可以成功地合并到我的分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|307440|git+checkout+branch-to-merge
git+pull
git+checkout+my-branch-name
git+merge+branch-to-merge|code-block|syntax|javascript|307441|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 had this issue today when I was merging another branch into mine after directly pulling from master, I had to checkout and pull the branch I was merging first, then I could merge this branch into mine successfully.
<pre><code>git checkout branch-to-merge
git pull
git checkout my-branch-name
git merge branch-to-merge
</code></pre>

blocks|key|307453|text|在我的例子中，我试图从git存储库的一个子目录执行git命令。请确保这是你用git初始化的目录，而不是它的子目录。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|307454|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

In my case I was trying to execute git commands from a sub-directory of the git repository.
Please make sure its the directory you initialized with git and not its sub-directory.

blocks|key|307487|text|我必须建议您检查所有分支机构，否则您要查找的分支机构首先可用|type|unstyled|depth|inlineStyleRanges|entityRanges|data|307488|git+branch+-r|offset|length|style|CODE|307489|从列表中检查|307490|origin/HEAD+->+origin/main
origin/feature/branch_1
origin/feature/branch_2
origin/feature/branch_3
origin/feature/branch_4
origin/feature/your+branch|code-block|syntax|javascript|307491|建议从原始列表本身复制列表，然后执行git+merge+origin/feature/branch_2。复制粘贴将消除打字错误。|307492|entityMap^0|0|0|D|0|0|0|I|X|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@$D|U|E|V|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|W|8|@]|9|@]|A|$]]|$1|J|3|K|5|L|7|X|8|@]|9|@]|A|$M|N]]|$1|O|3|P|5|6|7|Y|8|@$D|Z|E|10|F|G]]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|11|8|@]|9|@]|A|$]]]|R|$]]

I must suggest to to check all branches or the branch you are looking for is available at first
<code>git branch -r</code>
check from the list
<pre><code>origin/HEAD -&gt; origin/main
origin/feature/branch_1
origin/feature/branch_2
origin/feature/branch_3
origin/feature/branch_4
origin/feature/your branch
</code></pre>
Suggestion is to copy the listing from origin itself then do <code>git merge origin/feature/branch_2</code>. Copy pasting will remove typo error.

I just encountered a problem when merging a branch into master in git. First, I got the branch name by running <code>git ls-remote</code>. Let's call that branch "branch-name". I then ran <code>git merge branch-name</code> command and got the following result:

<pre><code>fatal: branch-name - not something we can merge
</code></pre>

How do I resolve this error?

How to resolve git's "not something we can merge" error

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

我刚刚在git中将分支合并到master时遇到了一个问题。首先，我通过运行git ls-remote获得了分支的名称。让我们将该分支命名为" branch -name“。然后，我运行git merge branch-name命令，得到以下结果：fatal: branch-name - not something we ...

问如何解决git的“我们不能合并的东西”错误
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何解决git的“我们不能合并的东西”错误EN