DEV Community

Discussion on: Git merge, git rebase, and crawling out of the git hole

Collapse
 
aminnairi profile image
Amin

Hello Juliette, nice article. This is by far the best explanation about the differences between rebase and merge in git!

I found on GitHub that you can do a squash merge. I learned to love it because it can squash (as its name indicates) all commits into one. From there, I always write something like Fixed an issue where the cat wasn't cute enough (#152) in the squash commit message. This allows having as many commits in the base branch as there are pull requests, keeping the history count low on the base branch. And if I need more details (meaning more commits history for that particular feature), I can click on the #152 which refers to the pull request ID.

What do you think? Is it a good idea in your opinion?