Hi Paul,
A couple of articles worth a read:
https://developer.atlassian.com/blog/201...at-debate/
https://blog.github.com/2016-04-01-squash-your-commits/
Here's a good explanation of squashing:
Quote:Commit squashing has the benefit of keeping your git history tidy and easier to digest than the alternative created by merge commits. While merge commits retain commits like “oops missed a spot” and “maybe fix that test? [round 2]”, squashing retains the changes but omits the individual commits from history. Many people prefer this workflow because, while those work-in-progress commits are helpful when working on a feature branch, they aren’t necessarily important to retain when looking at the history of your base branch.
So squashing would be appropriate for only some PRs, when merging small/individual chunks of work.
There seems to be a strong arguement for sticking with the standard merge commits, rather than rebasing onto the base branch.
I will have a look at extracting a cleaner project history with:
Code:
git log --first-parent
Andy.
