Git Merge, Squash or not

on github, there are 3 options when branches are merged.  the difference is here What's the Difference Between the 3 Github Merge Methods?

some good practices:  (image the branch structure is feature->development->master->release)

  1. Rebase and merge is not an option for most organizations.  This command normally requires the permission of push -f, which  can be a source of trouble
  2. when merging development to master, pls always choose Create a merge commit.  Otherwise, the next merge will require you to sync between development and master
  3. when merging feature branch to development, both  Create a merge commit  and Squash and merge can be used
    1. if it's a big change, and the change made in each commit is possible to be rolled back or is desired to be tracked, adopt Create a merge commit
    2. in most cases, pls use Squash and merge
  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值