TE
TechEcho
Home24h TopNewestBestAskShowJobs
GitHubTwitter
Home

TechEcho

A tech news platform built with Next.js, providing global tech news and discussions.

GitHubTwitter

Home

HomeNewestBestAskShowJobs

Resources

HackerNews APIOriginal HackerNewsNext.js

© 2025 TechEcho. All rights reserved.

Squash, Merge, or Rebase?

3 pointsby rckrdabout 3 years ago

1 comment

bob1029about 3 years ago
Why not all of the above?<p>Our process involves:<p><pre><code> 1. Create work branch off master 2. Just prior to PR creation, rebase against master (check build requires this) 3. Automatic check build passes 4. Human code review passes 5. Squash all work branch commits &amp; merge to master </code></pre> Our policy is that we don&#x27;t give a single shit about intermediate commits that occurred from the perspective of reviewing master commits. This would be a ton of noise because every developer works at a different pace. The work branch commits are sometimes useful lenses at code review time (depending on who&#x27;s work it is), but never really beyond that point.