blocks|key|1679181|text|你已经得到了rebase向后做的事情。git+rebase+master做了你所要求的-接受当前分支上的更改(因为它与主分支不同)，并在master上重放它们，然后将当前分支的头设置为新历史的头。它不会在当前分支的顶部重放来自master的更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1679182|entityMap^0|6|6|J|H|1W|6|35|6|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|$]]

You've got what <code>rebase</code> does backwards. <code>git rebase master</code> does what you're asking for — takes the changes on the current branch (since its divergence from master) and replays them on top of <code>master</code>, then sets the head of the current branch to be the head of that new history. It doesn't replay the changes from <code>master</code> on top of the current branch.

blocks|key|1679197|text|另一种看待它的方法是将git+rebase+master视为：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1679198|1679199|将当前分支重新设置为基于+master的基础|blockquote|BOLD|1679200|1679201|1679202|这里，'master‘是上游分支，这解释了为什么在rebase期间使用ours+and+theirs+are+reversed。|1679203|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/2959443/why-is-the-meaning-of-ours-and-theirs-reversed-with-git-svn/2960751#2960751^0|B|H|0|0|5|7|D|6|0|0|0|4|6|Z|4|18|6|C|2|Z|S|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|10|8|@$9|11|A|12|B|J]|$9|13|A|14|B|C]]|D|@]|E|$]]|$1|K|3|-4|5|6|7|15|8|@]|D|@]|E|$]]|$1|L|3|-4|5|6|7|16|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|17|8|@$9|18|A|19|B|C]|$9|1A|A|1B|B|C]|$9|1C|A|1D|B|C]|$9|1E|A|1F|B|J]]|D|@$9|1G|A|1H|1|1I]]|E|$]]|$1|O|3|-4|5|6|7|1J|8|@]|D|@]|E|$]]]|P|$Q|$5|R|S|T|E|$U|V]]]]

Another way to look at it is to consider <code>git rebase master</code> as:

<blockquote>
 Rebase the current branch on top of <code>master</code>
</blockquote>

Here , '<code>master</code>' is the upstream branch, and that explain why, during a rebase, <a href="https://stackoverflow.com/questions/2959443/why-is-the-meaning-of-ours-and-theirs-reversed-with-git-svn/2960751#2960751"><code>ours</code> and <code>theirs</code> are reversed</a>.

blocks|key|2154121|text|在主文件上重新设置当前更改的基址时，您可以：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2154122|rebase下拉最新的git+checkout+<branch_name>|offset|length|style|CODE|2154123|perform：git+pull+<remote_name>+master|unordered-list-item|2154124|
|2154125|checkout你想要改变的分支：git+checkout+<branch_name>|2154126|2154127|perform|2154128|2154129|：git+rebase+master|2154130|2154131|允许您将远程分支(例如，源/主分支)的更改重新设置为本地分支而不在本地更新远程分支的替代路径是：git+rebase+origin/master|2154132|entityMap^0|0|B|Q|0|8|T|0|0|H|Q|0|0|0|0|1|H|0|0|1C|O|0^^$0|@$1|2|3|4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|10|8|@$D|11|E|12|F|G]]|9|@]|A|$]]|$1|H|3|I|5|J|7|13|8|@$D|14|E|15|F|G]]|9|@]|A|$]]|$1|K|3|L|5|6|7|16|8|@]|9|@]|A|$]]|$1|M|3|N|5|J|7|17|8|@$D|18|E|19|F|G]]|9|@]|A|$]]|$1|O|3|L|5|6|7|1A|8|@]|9|@]|A|$]]|$1|P|3|Q|5|J|7|1B|8|@]|9|@]|A|$]]|$1|R|3|L|5|6|7|1C|8|@]|9|@]|A|$]]|$1|S|3|T|5|J|7|1D|8|@$D|1E|E|1F|F|G]]|9|@]|A|$]]|$1|U|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]|$1|V|3|W|5|6|7|1H|8|@$D|1I|E|1J|F|G]]|9|@]|A|$]]|$1|X|3|-4|5|6|7|1K|8|@]|9|@]|A|$]]]|Y|$]]

when rebasing current changes on top of master, you can:
<ol>
<li>pull down latest master: <code>git pull &lt;remote_name&gt; master</code></li>
<li>checkout the branch you want to rebase changes into: <code>git checkout &lt;branch_name&gt;</code></li>
<li>perform rebase: <code>git rebase master</code></li>
</ol>
an alternative path that lets you rebase changes from a remote branch (origin/master, for example)into a local branch without updating the remote branch locally is: <code>git rebase origin/master</code>

Okay. If I'm on a branch (say <code>working</code>), and I want to merge in the changes from another branch (say <code>master</code>), then I run the command <code>git-merge master</code> while on the <code>working</code> branch, and the changes get merged in without rebasing the history at all. If I run <code>git-rebase master</code>, then the changes in <code>master</code> are rebased to be put on the top of my <code>working</code> branch. But what if I want to merge in the changes from <code>master</code> but rebase my changes in <code>working</code> to be on top? How do I do that? Can it be done?

I could run <code>git-rebase working</code> on my <code>master</code> branch to put my changes on top in the <code>master</code> branch, but I'd like to be able to do that in my <code>working</code> branch, and I have no idea how. The closest that I can think of doing is creating a new branch from <code>master</code> and then rebase <code>working</code>'s changes on top of that, but then I'd have a new branch instead of altering the <code>working</code> branch.

How do you rebase the current branch's changes on top of changes being merged in?

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

好吧。如果我在一个分支(比如working)上，并且我想合并来自另一个分支(比如master)的更改，那么我在working分支上运行命令git-merge master，这些更改就会合并进来，而根本不需要重新设置历史的基址。如果我运行git-rebase master，那么master中的更改将被重新设置为将放在我的...

问如何在合并更改的基础上重新设置当前分支的更改基础？
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在合并更改的基础上重新设置当前分支的更改基础？EN