search

praekeltfoundation / puppet-marathon

A Puppet module for managing Marathon
BSD 3-Clause "New" or "Revised" License
4 stars 6 forks source link

squash commits before merge #20

Open felixb opened 8 years ago

felixb commented 8 years ago

What do you think about squashing commits before merging into dev/master? It's much easier to follow the changes and keeps the history clean and tight.

JayH5 commented 8 years ago

I know that squashing commits before a merge is a popular thing to do but it's currently not the way we use git at our organisation. We try not to use any history re-writing on any git branches available to multiple people as we find that it often causes confusion. We also believe leaving all commits in place makes it easier to see what changes happened where.

I've tried to keep a relatively detailed changelog (although it's not always perfectly up-to-date). I'd also recommend reading through the merge commits or closed pull requests to get a more detailed picture of what has changed. I've also tried to keep semantic versioning and a 0.0.1 version bump should never break the API.