Should you use merge commits or rebase when working on large codebases?
Frontend First
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
Transcript
Play full episode
Remember Everything You Learn from Podcasts
Save insights instantly, chat with episodes, and build lasting knowledge - all powered by AI.
