How to Merge and Rebase Long Running Branches

I used to be on team get merge, but there are reasons that I guess that's bad. So lately, I've been doing a lot more rebasing just because I'm bouncing around between feature branches a lot. And after I did that, it kind of ended up the way that I wanted to and just had to kind of go back and check and make sure that I didn't lose anything that I would have otherwise had with a rebase. For me, it's essentially, like, where do I want to manage the conflicts? Do I want to push them all together and manage them once? Right. Tailwind or vanilla CSS? Tailwind all the way.

Transcript

Play full episode

Transcript

Episode notes

The AI-powered Podcast Player

Save insights by tapping your headphones, chat with episodes, discover the best highlights - and more!

Get the app