blocks|key|2911669|text|您可以使用git重碱来压缩提交。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|2911670|在您的例子中，它应该是git重基-i头~3。|2911671|请参阅http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html|2911672|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/git-rebase|1|http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html^0|5|5|0|0|0|3|22|1|0^^$0|@$1|2|3|4|5|6|7|R|8|@]|9|@$A|S|B|T|1|U]]|C|$]]|$1|D|3|E|5|6|7|V|8|@]|9|@]|C|$]]|$1|F|3|G|5|6|7|W|8|@]|9|@$A|X|B|Y|1|Z]]|C|$]]|$1|H|3|-4|5|6|7|10|8|@]|9|@]|C|$]]]|I|$J|$5|K|L|M|C|$N|O]]|P|$5|K|L|M|C|$N|Q]]]]

You can use <a href="https://git-scm.com/docs/git-rebase" rel="nofollow">git rebase</a> to squash commits.

In your case, it should be git rebase -i HEAD~3.

See <a href="http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html" rel="nofollow">http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html</a>

blocks|key|2161584|text|合并提交只是一个提交，但似乎您已经掉进了“快速转发”陷阱。也就是说，在您的合并中，git已经决定master是release直接祖先的一部分，然后在release之上“快速转发”您的更改。这看起来就像你描述的那样。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2161585|要解决这个问题，请在合并中添加--no-ff选项：|2161586|git+checkout+release
git+merge+--no-ff+master|code-block|syntax|javascript|2161587|然后，您将在您的release分支上完全有一个提交；您可以编辑提交消息以包含您的发布版本。|2161588|entityMap^0|15|3|1C|6|1J|7|22|7|0|F|7|0|0|8|7|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]|$9|T|A|U|B|C]|$9|V|A|W|B|C]|$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|Z|8|@$9|10|A|11|B|C]]|D|@]|E|$]]|$1|H|3|I|5|J|7|12|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|13|8|@$9|14|A|15|B|C]]|D|@]|E|$]]|$1|O|3|-4|5|6|7|16|8|@]|D|@]|E|$]]]|P|$]]

The merge commit is only one commit, but it seems you have fallen into the "fast forward" trap. That is, on your merge, <code>git</code> has decided that <code>master</code> is part of the direct ancestry of <code>release</code>, and then just "fast forwarded" your changes on top of <code>release</code>. This, then, looks like what you describe.

To solve this, add the <code>--no-ff</code> option on your merge:

<pre><code>git checkout release
git merge --no-ff master
</code></pre>

You will, then, have exactly one commit on your <code>release</code> branch; you can edit the commit message to contain your release version.

blocks|key|1511324|text|git+checkout+release
git+merge+--squash+master
git+commit+-m+"Suitable+Message+of+your+choice"|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|1511325|这将从master分支获取所有提交，将它们压缩为1提交，然后将其与您的release分支合并。|unstyled|offset|length|style|CODE|1511326|entityMap^0|0|3|6|Z|7|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|N|8|@$G|O|H|P|I|J]|$G|Q|H|R|I|J]]|9|@]|A|$]]|$1|K|3|-4|5|F|7|S|8|@]|9|@]|A|$]]]|L|$]]

<pre><code>git checkout release
git merge --squash master
git commit -m "Suitable Message of your choice"
</code></pre>

This will take all the commits from the <code>master</code> branch, squash them into 1 commit and then merge it with your <code>release</code> branch.

blocks|key|2161681|text|如果您在GitLab图形界面上看到此消息，如下所示：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2161682|​|2161683|📷|atomic|offset|length|2161684|2161685|只需从您的MR链接中执行以下步骤：|2161686|编辑>合并选项:取消选中“当合并请求被接受时南瓜提交”选项。|blockquote|2161687|之后，在Gitlab上应该会发生合并。|2161688|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/cd94dcd781bf722079d3090ad6e7cf5f.png|imageAlt^0|0|0|0|1|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|10|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|11|8|@]|9|@$G|12|H|13|1|14]]|A|$]]|$1|I|3|C|5|6|7|15|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|16|8|@]|9|@]|A|$]]|$1|L|3|M|5|N|7|17|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|18|8|@]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|19|8|@]|9|@]|A|$]]]|R|$S|$5|T|U|V|A|$W|X|Y|-4]]]]

In case you are seeing this message on GitLab graphical interface, like this:
<a href="https://i.stack.imgur.com/aNcRe.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/aNcRe.png" alt="Gitlab error message" /></a>
Just follow these steps from your MR link:
<blockquote>
Edit &gt; Merge options: uncheck &quot;Squash commits when merge request is
accepted&quot; option.
</blockquote>
After that, merge should happen on Gitlab.

blocks|key|2161702|text|要手动压缩，请转到您的主分支或要合并的分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2161703|git+reset+--soft+HEAD~7+(number+of+commits+from+the+head+you+want+to+squash)
git+commit+-m+"squashed+commit"
git+push|code-block|syntax|javascript|2161704|这将重置为主分支中的多个提交。并且将创建一个包含所有更改的单独提交。PS:如果你面临一个自动壁球错误，你可以使用这个。|2161705|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|$]]

To squash manually
Go to your master branch or the branch you want to merge
<pre><code>git reset --soft HEAD~7 (number of commits from the head you want to squash)
git commit -m &quot;squashed commit&quot;
git push
</code></pre>
This will reset to a number of commits that were in the master branch. And One single commit will be created with all the changes.
PS: If you are facing an automatic squash error you can use this.

I have two branches <code>master</code> and <code>release</code> at gitlab.

At release branch, I hope it will only have commit message like: v0.1.0, v0.1.1.

Say after I finished developed v0.1.0, I have have several feature and bugfix commits in <code>master</code> say 

<pre><code>c1. bugfix1
c2. feature1 
c3. feature2
</code></pre>

I will create merge request in gitlab from <code>master</code> to <code>release</code>, but I hope to make these three commits into one <code>v0.1.0</code>, and squash c1 c2 c3.

Now , in my existing settings, I will have 4 commit messages:

<pre><code>Merge breanch 'master' into release
c1
c2
c3
</code></pre>

Is there a way to squash it when I approve at gitlab so that there message will squash into: 

<pre><code> v0.1.0
</code></pre>

Please note that these two branch are all proteced branches, and if possible I hope there will be NO git command on <code>release</code> and <code>master</code> branch , and only gitlab operations

How to squash commit when approve merge request, gitlab

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

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

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

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

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

我在gitlab有两个分支机构master和release。在发布分支时，我希望它只具有提交消息，比如: v0.1.0，v0.1.1。比方说，在我完成v0.1.0开发之后，我在master Say中有几个特性和say提交c1. bugfix1c2. feature1 c3. feature2我将在gitlab中创建从m...

问在批准合并请求时如何压缩提交，gitlab
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在批准合并请求时如何压缩提交，gitlabEN