3 ms·
They are different commands because they are different things conceptually. Rebase is when you transplant another branch on top of another. Merge joins two br
by jnurmine 8y ago
They are different commands because they are different things conceptually.
Rebase is when you transplant another branch on top of another.
Merge joins two branches together.
Squash combines two or more commits into a single one
They are by no means the same thing.
- speedplane 8y agoI never said they were the same, I said that having three commands to contribute code is very confusing. A better design would not need "merge", "squash", and "rebase". For example, you wouldn't need to "merge" or "squash" if the system made it easy to visually group changes together.