blocks|key|220051|text|当我试图将更改拉到一个分支中时，我也遇到了这个错误，这个分支不是从我试图从中拉出的上游分支创建的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|220052|Eg+-这将创建一个与上游的night-version匹配的新分支|offset|length|style|CODE|220053|git+checkout+upstream/night-version+-b+testnightversion|code-block|syntax|javascript|220054|这将在本地创建一个与上游的master分支相匹配的分支testmaster。|220055|git+checkout+upstream/master+-b+testmaster+|220056|现在，如果我尝试将night-version的更改拉到testmaster分支中，则会导致此错误。|220057|git+pull+upstream+night-version+//while+I'm+in+`master`+cloned+branch|220058|我设法通过导航到适当的分支并拉出更改来解决这个问题。|220059|git+checkout+testnightversion
git+pull+upstream+night-version+//+works+fine.|220060|entityMap^0|0|E|D|0|0|D|6|R|A|0|0|9|D|R|A|0|0|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|11|8|@$D|12|E|13|F|G]]|9|@]|A|$]]|$1|H|3|I|5|J|7|14|8|@]|9|@]|A|$K|L]]|$1|M|3|N|5|6|7|15|8|@$D|16|E|17|F|G]|$D|18|E|19|F|G]]|9|@]|A|$]]|$1|O|3|P|5|J|7|1A|8|@]|9|@]|A|$K|L]]|$1|Q|3|R|5|6|7|1B|8|@$D|1C|E|1D|F|G]|$D|1E|E|1F|F|G]]|9|@]|A|$]]|$1|S|3|T|5|J|7|1G|8|@]|9|@]|A|$K|L]]|$1|U|3|V|5|6|7|1H|8|@]|9|@]|A|$]]|$1|W|3|X|5|J|7|1I|8|@]|9|@]|A|$K|L]]|$1|Y|3|-4|5|6|7|1J|8|@]|9|@]|A|$]]]|Z|$]]

I've also had this error when trying to pull the changes into a branch which is not created from the upstream branch from which I'm trying to pull.

Eg - This creates a new branch matching <code>night-version</code> of upstream

<pre><code>git checkout upstream/night-version -b testnightversion
</code></pre>

This creates a branch <code>testmaster</code> in local which matches the <code>master</code> branch of upstream.

<pre><code>git checkout upstream/master -b testmaster 
</code></pre>

Now if I try to pull the changes of <code>night-version</code> into <code>testmaster</code> branch leads to this error.

<pre><code>git pull upstream night-version //while I'm in `master` cloned branch
</code></pre>

I managed to solve this by navigating to proper branch and pull the changes.

<pre><code>git checkout testnightversion
git pull upstream night-version // works fine.
</code></pre>

blocks|key|438233|text|.MERGE_MSG.swp在你的git中是打开的，你只需要删除这个.swp文件。在我的例子中，我使用了下面的命令，它工作得很好。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|438234|rm+.MERGE_MSG.swp|code-block|syntax|javascript|438235|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|$]]

.MERGE_MSG.swp is open in your git, you just need to delete this .swp file. In my case I used following command and it worked fine.

<pre><code>rm .MERGE_MSG.swp
</code></pre>

blocks|key|220088|text|更多信息...有时，.swp文件可能由后台运行的虚拟机保存。当您尝试删除文件时，可能会看到权限被拒绝的消息。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|220089|​|220090|📷|atomic|offset|length|220091|220092|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/c75d9c9b39f00a489e22c30f285e9212.png|imageAlt^0|0|0|0|1|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@$G|V|H|W|1|X]]|A|$]]|$1|I|3|C|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|K|$L|$5|M|N|O|A|$P|Q|R|-4]]]]

More info...
Some times .swp files might be holded by vm that was running in backgroung.
You may see permission denied message when try to delete the files.
<a href="https://i.stack.imgur.com/KH8lA.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/KH8lA.png" alt="Check and kill process vm" /></a>

blocks|key|438269|text|删除.MERGE_MSG.swp以避免E325:+ATTENTION。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|438270|rm+.MERGE_MSG.swp|code-block|syntax|javascript|438271|通常，.example.swp文件并不重要。|438272|另外，通常.example.swp文件与原始文件在同一目录下。这样，您就不能在终端上使用ls列出.example.swp文件。您需要使用ll或ls+-a命令列出终端上的.example.swp文件。|438273|entityMap^0|2|E|J|F|0|0|3|C|0|5|C|18|2|1C|C|1W|2|1Z|5|2C|C|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]|$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|V|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|Z|8|@$9|10|A|11|B|C]|$9|12|A|13|B|C]|$9|14|A|15|B|C]|$9|16|A|17|B|C]|$9|18|A|19|B|C]|$9|1A|A|1B|B|C]]|D|@]|E|$]]|$1|O|3|-4|5|6|7|1C|8|@]|D|@]|E|$]]]|P|$]]

Remove <code>.MERGE_MSG.swp</code> to avoid <code>E325: ATTENTION</code>.
<pre><code>rm .MERGE_MSG.swp
</code></pre>
Normally <code>.example.swp</code> file is not important.
In addition, normally <code>.example.swp</code> file is made in the same directory of the original file. Then, you cannot list <code>.example.swp</code> files with <code>ls</code> on terminal. You need to use <code>ll</code> or <code>ls -a</code> commands to list <code>.example.swp</code> files on terminal.

When I try to merge my branch with a remote branch:

<pre><code>git merge feature/remote_branch
</code></pre>

I got this message:

<pre><code>E325: ATTENTION
Found a swap file by the name ".git/.MERGE_MSG.swp"
 owned by: xxxxxx dated: Mon Nov 12 23:17:40 2012
 file name: ~xxxxxx/Desktop/My-ios-App/.git/MERGE_MSG
 modified: YES
 user name: xxxxxx host name: unknown-b8-8d-12-22-27-72.lan
 process ID: 1639
While opening file ".git/MERGE_MSG"
 dated: Tue Nov 13 14:06:48 2012
 NEWER than swap file!

(1) Another program may be editing the same file.
 If this is the case, be careful not to end up with two
 different instances of the same file when making changes.
 Quit, or continue with caution.

(2) An edit session for this file crashed.
 If this is the case, use ":recover" or "vim -r .git/MERGE_MSG"
 to recover the changes (see ":help recovery").
 If you did this already, delete the swap file ".git/.MERGE_MSG.swp"
 to avoid this message.

Swap file ".git/.MERGE_MSG.swp" already exists!
[O]pen Read-Only, (E)dit anyway, (R)ecover, (D)elete it, (Q)uit, (A)bort:
</code></pre>

How to deal with this?

Found a swap file by the name

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

当我尝试将分支与远程分支合并时：git merge feature/remote_branch我收到了这样的消息：E325: ATTENTIONFound a swap file by the name ".git/.MERGE_MSG.swp"          owned by: xxxxxx   dated: M...

问找到一个名为的交换文件
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问找到一个名为的交换文件EN