Squash all commit on feature branch

[byhbt]

Problem:

master > develop > feature_a > feature_b > feature_c

feature_b branch is based on feature_a, and feature_c is based on feature_b.

It sounds a bit strange but in real-life case, there are some situations like that.

If the feature_a has 20 commits, then when feature_b rebase, it has to go through 20 commits :( quite nightmare.

Solution:

Squash all commit in feature_a to 1 commit.
But if the feature_b branch before feature_a squash, please rebase again make sure the commit is consistent between 2 branches.

Lesson:

• https://blog.carbonfive.com/always-squash-and-rebase-your-git-commits/