“GIT слияние стратегии” Ответ

GIT слияние стратегии

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/