当前位置:   article > 正文

Git Merge, Squash or not_squah and merge

squah and merge

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
声明:本文内容由网友自发贡献,不代表【wpsshop博客】立场,版权归原作者所有,本站不承担相应法律责任。如您发现有侵权的内容,请联系我们。转载请注明出处:https://www.wpsshop.cn/w/weixin_40725706/article/detail/824990?site
推荐阅读
相关标签
  

闽ICP备14008679号