Which Option to Choose for Git Merge
When submitting a Merge Request (MR) for a project branch, there are three options: Merge, Rebase, and Squash.
What are the differences between these three options, and how should you choose? Here’s a summary.
Merge
The essence of Merge is creating a new commit node, with all commits from the source branch brought over. If there were initially three commits, after the Merge, four commit nodes will exist, with one being the Merge Commit. The commit created by Merge also carries the source branch’s commit information. Therefore, in many Git GUI tools, these details form a commit relationship graph.