blocks|key|2798694|text|这取决于导致冲突的行动类型(merge+or+rebase)。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|2798695|在您的例子中，合并，其中：|2798696|当前的更改表示您拥有的内容(+merge)|2798697|incoming更改的目标表示合并的内容(合并的源)|unordered-list-item|2798698|
)|2798699|然后：|2798700|2798701|选项1(“接受传入的更改”)将完全忽略您所拥有的，并保留您合并的内容。|2798702|选项2(“接受当前的更改”)将完全忽略您合并的内容，并保留您所拥有的。|2798703|2798704|别忘了，万一重新基地，"what+you+have"+and+"what+you+merge"+are+reversed。|2798705|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/7062773/6309|1|https://stackoverflow.com/a/2960751/6309^0|E|F|0|0|0|0|0|0|0|0|0|0|0|B|1D|1|0^^$0|@$1|2|3|4|5|6|7|16|8|@]|9|@$A|17|B|18|1|19]]|C|$]]|$1|D|3|E|5|6|7|1A|8|@]|9|@]|C|$]]|$1|F|3|G|5|6|7|1B|8|@]|9|@]|C|$]]|$1|H|3|I|5|J|7|1C|8|@]|9|@]|C|$]]|$1|K|3|L|5|6|7|1D|8|@]|9|@]|C|$]]|$1|M|3|N|5|6|7|1E|8|@]|9|@]|C|$]]|$1|O|3|-4|5|6|7|1F|8|@]|9|@]|C|$]]|$1|P|3|Q|5|J|7|1G|8|@]|9|@]|C|$]]|$1|R|3|S|5|J|7|1H|8|@]|9|@]|C|$]]|$1|T|3|-4|5|6|7|1I|8|@]|9|@]|C|$]]|$1|U|3|V|5|6|7|1J|8|@]|9|@$A|1K|B|1L|1|1M]]|C|$]]|$1|W|3|-4|5|6|7|1N|8|@]|9|@]|C|$]]]|X|$Y|$5|Z|10|11|C|$12|13]]|14|$5|Z|10|11|C|$12|15]]]]

<p>It depends on the type of operation (<a href="https://stackoverflow.com/a/7062773/6309">merge or rebase</a>) leading to that conflict.</p>
<p>In your case, a merge, where:</p>
<ul>
<li>current change represents what you have (the destination of the merge)</li>
<li>incoming change represents what you merge (the source of the merge)</li>
</ul>
<p>Then:</p>
<ul>
<li>Option 1 (&quot;Accept Incoming changes&quot;) would ignore completely what you had, and keep what you merge.</li>
<li>Option 2 (&quot;Accept current changes&quot;) would ignore completely what you merge, and keep what you had.</li>
</ul>
<p>Don't forget, in case of a rebase, <a href="https://stackoverflow.com/a/2960751/6309">&quot;what you have&quot; and &quot;what you merge&quot; are reversed</a>.</p>


blocks|key|2798726|text|如果是因为重新基地而引起的冲突，你总能想象到-|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2798727|2798728|--您的主分支是固定的|ordered-list-item|2798729|--一个特性分支起源于主服务器上较早的提交，它正在从主服务器上的最新提交转移到最新的主提交(这就是重基的核心内容)。|2798730|2798731|如果你从主人的角度看-|2798732|2798733|incoming+changes是将移动到母版(即功能分支中的更改)的部分，因此术语为.|unordered-list-item|offset|length|style|CODE|BOLD|2798734|。|2798735|2798736|current+changes是已经存在于主版中的那些(即由其他开发人员或您自己在主版上完成的)。|2798737|2798738|在合并冲突的情况下，正如@VonC所建议的那样，术语是相反的。|2798739|entityMap^0|0|0|0|0|0|0|0|0|G|I|3|0|0|0|0|F|0|0|0^^$0|@$1|2|3|4|5|6|7|13|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|14|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|15|8|@]|9|@]|A|$]]|$1|F|3|G|5|E|7|16|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|17|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|18|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|19|8|@]|9|@]|A|$]]|$1|L|3|M|5|N|7|1A|8|@$O|1B|P|1C|Q|R]|$O|1D|P|1E|Q|S]]|9|@]|A|$]]|$1|T|3|U|5|6|7|1F|8|@]|9|@]|A|$]]|$1|V|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]|$1|W|3|X|5|N|7|1H|8|@$O|1I|P|1J|Q|R]]|9|@]|A|$]]|$1|Y|3|-4|5|6|7|1K|8|@]|9|@]|A|$]]|$1|Z|3|10|5|6|7|1L|8|@]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1M|8|@]|9|@]|A|$]]]|12|$]]

<p>If it's a conflict due to a rebase, you could always imagine like so -</p>
<ol>
<li>Your master branch is fixed</li>
<li>A feature branch that originated from an older commit on master, is shifting itself from there to the latest commit on master (that's what a rebase is, at its core).</li>
</ol>
<p>Now, if you see from the point of view of master -</p>
<ul>
<li><p><code>incoming changes</code> are the ones that move <strong>to</strong> master (i.e. changes in your feature branch), hence the term.</p>
</li>
<li><p><code>current changes</code> are the ones that are already present in master (i.e. ones done by fellow developers or yourself on master).</p>
</li>
</ul>
<p>In case of merge conflicts, as suggested by @VonC, the terminology is reversed.</p>


blocks|key|171355|text|您在特性分支上。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|171356|1.+git+pull+origin+master|CODE|171357|当前变化|171358|更改当前功能分支。|171359|传入变更|171360|从主分支中提取的更改|171361|171362|2.+git+pull+origin+master+--rebase|171363|在重基期间，在主分支中已经存在的提交的基础上应用功能分支更改。|171364|171365|更改主分支。|171366|171367|功能分支上的更改。|171368|171369|*重新基地后，你需要用力推动你的分支。使用--force-with-lease而不是--force|171370|entityMap^0|2|2|0|3|M|0|0|4|2|0|0|1|1|0|0|3|V|0|0|0|2|1|0|0|0|2|0|0|L|I|16|7|0^^$0|@$1|2|3|4|5|6|7|16|8|@$9|17|A|18|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|19|8|@$9|1A|A|1B|B|H]]|D|@]|E|$]]|$1|I|3|J|5|6|7|1C|8|@]|D|@]|E|$]]|$1|K|3|L|5|6|7|1D|8|@$9|1E|A|1F|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|1G|8|@]|D|@]|E|$]]|$1|O|3|P|5|6|7|1H|8|@$9|1I|A|1J|B|C]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|1K|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|1L|8|@$9|1M|A|1N|B|H]]|D|@]|E|$]]|$1|T|3|U|5|6|7|1O|8|@]|D|@]|E|$]]|$1|V|3|J|5|6|7|1P|8|@]|D|@]|E|$]]|$1|W|3|X|5|6|7|1Q|8|@$9|1R|A|1S|B|C]]|D|@]|E|$]]|$1|Y|3|N|5|6|7|1T|8|@]|D|@]|E|$]]|$1|Z|3|10|5|6|7|1U|8|@$9|1V|A|1W|B|C]]|D|@]|E|$]]|$1|11|3|-4|5|6|7|1X|8|@]|D|@]|E|$]]|$1|12|3|13|5|6|7|1Y|8|@$9|1Z|A|20|B|H]|$9|21|A|22|B|H]]|D|@]|E|$]]|$1|14|3|-4|5|6|7|23|8|@]|D|@]|E|$]]]|15|$]]

<p>You are on a <strong>feature</strong> branch</p>
<h4>1. <code>git pull origin master</code></h4>
<h5>Current changes</h5>
<p>Changes on your current <strong>feature</strong> branch.</p>
<h5>Incoming changes</h5>
<p>Changes you are pulling from i.e the <strong>master</strong> branch</p>
<hr />
<h4>2. <code>git pull origin master --rebase</code></h4>
<p>During rebase your feature branch changes are applied on top of the commits that are already there in master branch.</p>
<h5>Current changes</h5>
<p>Changes on the <strong>master</strong> branch.</p>
<h5>Incoming changes</h5>
<p>Changes on the <strong>feature</strong> branch.</p>
<hr />
<p>* After a rebase, you need to force push your branch. Use <code>--force-with-lease</code> instead of <code>--force</code></p>


<p>Problem occurs when codes are conflict.</p>

<p><a href="https://i.stack.imgur.com/Wx83C.png" rel="noreferrer"><img src="https://i.stack.imgur.com/Wx83C.png" alt="VSCode merge resolution"></a></p>

<p>As you see in image given above that four options are there </p>

<ol>
<li>Accept incoming changes</li>
<li>Accept current changes </li>
<li>Accept Both changes</li>
<li>Compare changes</li>
</ol>

<p>I want to know the difference between <code>Accept Current changes</code> and <code>Accept Incoming changes</code> </p>


GitHub: Difference between Accept current changes and Incoming changes

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

当代码发生冲突时会出现问题。​​正如你在上图中看到的，有四种选择changesCompare 接受传入的更改接受当前的更改同时接受更改我想知道Accept Current changes和Accept Incoming changes的区别

问GitHub:接受当前更改和传入更改之间的区别
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问GitHub:接受当前更改和传入更改之间的区别EN