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
Transcript
Play full episode

Remember Everything You Learn from Podcasts

Save insights instantly, chat with episodes, and build lasting knowledge - all powered by AI.
App store bannerPlay store banner