Coding Blocks cover image

Git from the Bottom Up – Rebasing

Coding Blocks

00:00

How to Merge a Feature Branch Back Into the Trunk

i just wanted to follow up our close leap on the show branch. And essentially what they said happens here, and this is kind of interesting, cause i don't think i'd ever really looked at it in terms of what git was doing behind the scenes. When you merge your feature branch back into the trunk, what it's doing is, it's creating a new commit that they said is basically a meda comit. They say you can do that with every source control system out there. But what's weird about its choice here, again, is that it's showing that in lieu of the branch name. So you either see the branch name or the shaw, but you don

Transcript
Play full episode

The AI-powered Podcast Player

Save insights by tapping your headphones, chat with episodes, discover the best highlights - and more!
App store bannerPlay store banner
Get the app