2min chapter

Frontend First cover image

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

Frontend First

CHAPTER

Squash and Merge - What Happened This Week?

You can't squash with the mass with the merge commits in there. And it also changes your like Shaw. So then we would just always rebase and that forced you to deal with conflicts along the way. But that's good because you want to know if your changes affect, if any changes that had happened since you started working your feature branch affect the changes you're a bit making,. You resolve those.

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