English 中文(简体)
git 合并:是否有办法强迫——squash?
原标题:git merge: is there a way to force --squash?

因此,我们项目的工作进展也一样:我们创造出一个任务/选择票,我们从主人手就任务/任务开展工作,最终将其重新分配给主人。 我们愿意主人承诺提供ice。 从事任务部门工作的人可能没有良好的承诺信息,而且 ,但是如果将分行合并,就会掌握不明确的信息。

解决这一问题的办法之一,是永远与————————————————————————————主人。 这样,你们就有机会提供良好的承诺信息,把各种承诺当作一种承诺。 我不禁要问,是否有办法? 意思是,如果我们能够让电梯服务器拒绝 t的合并?

问题回答

虽然不能直接强迫,但你可以将<代码>-squash作为<代码>master/code>的缺省合并选择。 分支:

git config branch.master.mergeoptions  "--squash"

这将总是把承诺合并为主,而不必具体指明<代码>--squash备选办法。

你们需要的是一台服务机,以确保所推动的是你们需要的东西。 你们会拒绝任何会带来不止一项不合并承诺的参考改动。 你可以在那里做其他检查,看看该评论载有一张票牌等。

您可使用<代码>rebase-i,允许您基本上将事务组的所有承诺化为1项承诺,然后将该处(1项承诺)合并为主。





相关问题
git confusion - cloning a repo is returning a past version

Im having some confusion with my git usage. I cloned a repo from one comp to the other, and the new clone is the state of the original that was active some time ago. So its cloning a past version. ...

Appropriate strategy for tagging and hotfixing with git

I was wondering if the strategy I m using for tagging and hotfixing tags (which then I use for deploying rails applications) with git is appropriate. For tagging I just tag a commit of the master ...

Tips on upgrading CVS to git/hg?

We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...

Using Git in a TFS shop

Using Git at home has spoiled me - I now find using TFS at work to be a bit of a drag and want to explore the possibility of using Git locally and syncing somehow with TFS. I figure there are a few ...

热门标签