Thursday, April 16, 2020

what is squash merge ?

Square merging is a  merge option that allows you to condense the Git history of topic branches when you complete a pull request. Instead of each commit on the topic branch being added to the history of the default branch, a square merge takes all the file changes and adds them to a single new commit on the default branch.

A simple way to think about this is that squash merge gives you just the file changes, and a regular merge gives you the file changes and the commit history.

Note:
Squash merging keeps your default branch histories clean and easy to follow without demanding any workflow changes on your team. Contributors to the topic branch work how they want in the topic branch, and the default branches keep a linear history through the use of squash merges. The commit history of a master branch updated with squash merges will have one commit for each merged  branch. You can step through this history commit by commit to find out exactly when work was done.

References:

https://docs.microsoft.com/en-us/azure/devops/repos/git/merging-with-squash




No comments:

Post a Comment