Different git merge types

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:

Screenshot from an Azure DevOps pull request

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s