2min chapter

Frontend First cover image

Should you use merge commits or rebase when working on large codebases?

Frontend First

CHAPTER

Is There a Way to Merge Commits?

There was a very good reason that we started doing this. We wanted clean PRs. And so if you have merge commits while you're working and then you try to squash them, it's really weird because now you're merging into it doesn't really work. But essentially you want yours to be added once you're ready to merge it. Right? So we would want all of our like 10 commits for the feature on top and then we might rebase. Like one, we'd always rebase. That's probably what it was. It looks like these two things are happening in parallel because in time in like real world time, they are happening in Parallel. Exactly.

00:00

Get the Snipd
podcast app

Unlock the knowledge in podcasts with the podcast player of the future.
App store bannerPlay store banner

AI-powered
podcast player

Listen to all your favourite podcasts with AI-powered features

Discover
highlights

Listen to the best highlights from the podcasts you love and dive into the full episode

Save any
moment

Hear something you like? Tap your headphones to save it with AI-generated key takeaways

Share
& Export

Send highlights to Twitter, WhatsApp or export them to Notion, Readwise & more

AI-powered
podcast player

Listen to all your favourite podcasts with AI-powered features

Discover
highlights

Listen to the best highlights from the podcasts you love and dive into the full episode