Gitflow: Should I squash commits when merging from a release branch into master?

后端 未结 3 1628
梦毁少年i
梦毁少年i 2021-02-05 01:20

I am going to merge my release branch to master and I am wondering if I should squash the commits from develop into a single merge commit when merging into master.

Gener

3条回答
  •  我在风中等你
    2021-02-05 02:03

    If you squash merge between develop, a release branch and master it gets very hard to merge a change to a release branch back to develop without file conflicts. It's also hard to merge a hotfix to develop, then merge develop through a release back to master later.

提交回复
热议问题