如何在Eclipse中混合合并壁球 [英] How to git merge squash in Eclipse

问题描述

有时候我需要从Eclipse中合并squash。我知道我可以通过命令行来完成，但在Eclipse中集成图形选项将非常有用。你知道该怎么做吗？

.eclipse.org / EGit / User_Guide＃Interactive_Rebaserel =nofollow noreferrer> EGit中的交互式重新定制 ，然后选择想要压缩的提交的压扁。

---

注意：为了压扁最后几次提交，历史上另一种方式是软重置此主题）

• 在历史记录中选择我不想压扁的第一个提交


• 右键单击并说 团队 - >重设 - >软


• 右键点击并说提交。此提交将包含所有最后m个提交的更改

Sometimes I need to merge squash from Eclipse. I know I can do it in command line, but it will be really useful to have graphic option integrated in Eclipse. Do you know how to do it?

解决方案

You can start an interactive rebase in EGit, and select squash for the commits you want squashed.

---

Note: for squashing the last few commits, historically the other way was a soft reset (see this thread)

• select in history the first commit which I don't want to squash
• right-click and say "Team->Reset->Soft"
• right-click and say "Commit". This commit will contain all the changes of the last m commits together

这篇关于如何在Eclipse中混合合并壁球的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！