2min chapter

Frontend First cover image

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

Frontend First

CHAPTER

GitHub

There's actually this button in GitHub that lets you like update main into this and then we click that. It basically created a merge commit, which is not rebasing. And so we were like, oh, should we undo that? So it got us thinking. One of the bad things about doing the interactive rebase is always a risk is that when you go and do that, you are changing history. But if you don't have a conflict, it doesn't matter. If you're only working on files that aren't changed with the new changes from main, theRebase will literally just pull your commits out,. Move the base of your branch to the new tip of head and then

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