Git Merge, Squash or not

最新推荐文章于 2024-10-21 16:21:31 发布

原创最新推荐文章于 2024-10-21 16:21:31 发布 · 179 阅读

CC 4.0 BY-SA版权

文章标签：

本文详细解读了GitHub上三种合并分支的方法——直接合并、创建合并提交和 squash 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)

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
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
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