I recently started using Azure DevOps as my source code repository for a project, and upon opening my first pull request I noticed that they provide a nice explanation of the different merge types supported. In fact, it is one of the simplest and easiest to understand explanations of git merges I have ever seen, so I’m sharing here for all:
Matt Callahan's Blog 📝 