blocks|key|1911156|text|使用rebase而不是合并分支可以更容易地跟踪，但提交的历史不那么准确。你的团队应该同意在什么情况下你应该rebase一个分支。您仍然应该始终通过拉请求将分支合并到主分支。
建议的方法是允许重新调整您已经完成但尚未与他人共享的本地更改，但是一旦您与他人共享了更改，则可以进行合并。这避免了重写历史记录的麻烦，同时也让您在本地开发代码时可以轻松地赶上更改。|type|blockquote|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1911157|参考资料来源：|unstyled|1911158|https://learn.microsoft.com/en-us/vsts/git/tutorial/rebase?tabs=visual-studio#when-to-rebase-vs-merge|unordered-list-item|1911159|https://learn.microsoft.com/en-us/vsts/git/tutorial/pulling?tabs=visual-studio#update-your-branch-with-the-latest-changes-from-master|1911160|entityMap|0|LINK|mutability|MUTABLE|url|1^0|2|6|1H|6|0|0|0|2T|0|0|0|3P|1|0^^$0|@$1|2|3|4|5|6|7|V|8|@$9|W|A|X|B|C]|$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|10|8|@]|D|@]|E|$]]|$1|I|3|J|5|K|7|11|8|@]|D|@$9|12|A|13|1|14]]|E|$]]|$1|L|3|M|5|K|7|15|8|@]|D|@$9|16|A|17|1|18]]|E|$]]|$1|N|3|-4|5|H|7|19|8|@]|D|@]|E|$]]]|O|$P|$5|Q|R|S|E|$T|J]]|U|$5|Q|R|S|E|$T|M]]]]

<blockquote>
<p>Using <code>rebase</code> instead of merging branches results in an easier to follow but less exact history of commits. Your team should agree under what circumstances you should <code>rebase</code> a branch. You should still always merge branches into the main branch through a pull request.</p>
<p>A suggested approach is to allow rebasing local changes that you have made but haven't shared with others, but to merge once you are sharing changes with others. This avoids trouble with rewriting history while still letting you easily catch up with changes as you develop your code locally.</p>
</blockquote>
<h1>Ref &amp; Source:</h1>
<ul>
<li><a href="https://learn.microsoft.com/en-us/vsts/git/tutorial/rebase?tabs=visual-studio#when-to-rebase-vs-merge" rel="nofollow noreferrer">https://learn.microsoft.com/en-us/vsts/git/tutorial/rebase?tabs=visual-studio#when-to-rebase-vs-merge</a></li>
<li><a href="https://learn.microsoft.com/en-us/vsts/git/tutorial/pulling?tabs=visual-studio#update-your-branch-with-the-latest-changes-from-master" rel="nofollow noreferrer">https://learn.microsoft.com/en-us/vsts/git/tutorial/pulling?tabs=visual-studio#update-your-branch-with-the-latest-changes-from-master</a></li>
</ul>


blocks|key|1157827|text|目前看来，GitHub桌面中没有包含该功能。我通常要做的是单击左上角下拉菜单中的存储库名称，然后单击“打开终端”。然后，只需遵循这里的指示。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1157828|更新：|1157829|如果将此添加到您的.gitconfig中，则GitHub桌面应根据这里进行重基。|style|CODE|1157830|[pull]
++++rebase+=+true|code-block|syntax|javascript|1157831|第二次更新：|1157832|GitHub桌面2.0现在支持重新构建内置的！它位于顶部菜单的分支部分下，也可以使用快捷方式⇧⌘E。|1157833|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/git-rebase|1|https://github.com/desktop/desktop/issues/3422#issuecomment-467948996^0|1S|2|0|0|0|9|A|X|2|1|0|0|0|1A|3|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@$A|13|B|14|1|15]]|C|$]]|$1|D|3|E|5|6|7|16|8|@]|9|@]|C|$]]|$1|F|3|G|5|6|7|17|8|@$A|18|B|19|H|I]]|9|@$A|1A|B|1B|1|1C]]|C|$]]|$1|J|3|K|5|L|7|1D|8|@]|9|@]|C|$M|N]]|$1|O|3|P|5|6|7|1E|8|@]|9|@]|C|$]]|$1|Q|3|R|5|6|7|1F|8|@$A|1G|B|1H|H|I]]|9|@]|C|$]]|$1|S|3|-4|5|6|7|1I|8|@]|9|@]|C|$]]]|T|$U|$5|V|W|X|C|$Y|Z]]|10|$5|V|W|X|C|$Y|11]]]]

<p>It does not appear that feature is currently included in GitHub desktop. What I normally do is click on the repository name in the drop-down menu in the top left and then click on "open in terminal". Then just follow the instructions <a href="https://git-scm.com/docs/git-rebase" rel="noreferrer">here</a>.</p>

<hr>

<h3>Update:</h3>

<p>If you add this to your <code>.gitconfig</code>, GitHub desktop should rebase according to <a href="https://github.com/desktop/desktop/issues/3422#issuecomment-467948996" rel="noreferrer">here</a>.</p>

<pre><code>[pull]
    rebase = true
</code></pre>

<hr>

<h2>Second Update:</h2>

<p>GitHub desktop 2.0 now supports rebasing built in! It is under the branch section of the top menu or you can use the shortcut <code>⇧⌘E</code></p>


blocks|key|1157946|text|不是的。一年前，他们的GitHub问题跟踪器上就有一个GitHub问题跟踪器，而反应正是这样做的。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1157947|这个想法对未来是很有趣的，但这超出了我们目前路线图的范围。|blockquote|1157948|从那时起，仍然处于开放状态的另一个功能请求也被发布了。|1157949|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/desktop/desktop/issues/1652#issuecomment-312099782|1|https://github.com/desktop/desktop/issues/3422^0|14|2|0|0|0|E|7|1|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@$A|T|B|U|1|V]]|C|$]]|$1|D|3|E|5|F|7|W|8|@]|9|@]|C|$]]|$1|G|3|H|5|6|7|X|8|@]|9|@$A|Y|B|Z|1|10]]|C|$]]|$1|I|3|-4|5|6|7|11|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]|Q|$5|L|M|N|C|$O|R]]]]

<p>No. There was a <a href="https://github.com/desktop/desktop/issues/1652" rel="nofollow noreferrer">feature request</a> on their GitHub issue tracker for exactly this option a year ago, for which <a href="https://github.com/desktop/desktop/issues/1652#issuecomment-312099782" rel="nofollow noreferrer">the response</a> was</p>

<blockquote>
  <p>This idea is interesting for the future, but this is beyond the scope of our current roadmap.</p>
</blockquote>

<p>Since then, <a href="https://github.com/desktop/desktop/issues/3422" rel="nofollow noreferrer">another feature request</a>, which is still open, has also been posted.</p>


blocks|key|982394|text|正如@Taraz对这个问题的评论，GitHub桌面现在有了内置的选项。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|982395|Branch+>+Rebase+current+branch|offset|length|style|CODE|982396|它在Update+from+master选项下面|982397|entityMap^0|0|0|U|0|2|I|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|P|8|@$D|Q|E|R|F|G]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|K|$]]

<p>As @Taraz commented on the question, GitHub Desktop now has the option built in.</p>
<p><code>Branch &gt; Rebase current branch</code></p>
<p>It's below the <code>Update from master</code> option</p>


<p>When I choose <strong>"update from master"</strong>, it creates a merge commit. I'd rather just have it re-base. Is this possible?</p>


Is there a way to make GitHub Desktop rebase a branch against master?

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

当我选择“从主更新”时，它会创建一个合并提交。我宁愿让它重新开始。这个是可能的吗？

问有什么方法可以让GitHub桌面将一个分支重新定位到主板上吗？
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问有什么方法可以让GitHub桌面将一个分支重新定位到主板上吗？EN