GIT QuickStart : 10 Squash Merge in GIT using VisualStudio

Описание

There are different ways of integrating code changes from one branch to another.
1) Merge
2) Rebase
3) Cherry –pick
4) Squash Merge
When you complete a pull request in Team Services, you merge the topic branch into your default branch, usually master. This merge adds the commits of the topic branch to your main branch and creates a merge commit to reconcile any conflicts between the default and topic branch. The comments and discussion in the pull request give additional context for the changes made in the topic branch.