📅  最后修改于: 2022-03-11 14:56:36.439000             🧑  作者: Mango
There are four main strategies:
- Explicit Merge (aka non fast-forward)
- Fast Forward Merge
- Rebase
- Squash
Good resource: https://blog.developer.atlassian.com/pull-request-merge-strategies-the-great-debate/