About this episode
In this installment of Programming By Stealth Bart teaches us how to deal with conflicts in branches of our code. He has been purposely only changing one thing at a time before now, but it's time to face the reality of when two branches change the same line in the same file. I've been terrified of this topic for a long time, but Bart shows us how easy it is to see exactly what the conflict is, how you can back out of merging if you make "a pig's breakfast" of it, and how to resolve your conflicts without fear. It's not nearly as terrifying as I thought it would be.
You can find Bart's tutorial show notes at [pbs.bartificer.net/...](https://pbs.bartificer.net/pbs110)
And if you learn a lot from Bart, please consider becoming a patron of his by going to [www.patreon.com/...](https://www.patreon.com/ltpod/posts)
Get every episode summarized
Each time Programming By Stealth publishes, we email you a written briefing from the transcript — the topics, who appeared, and any specific claims, with the ad reads skipped.
Email me new episodesFree for 3 shows. No card needed.
Hosts & guests
No transcript yet
This episode has not been transcribed. Request it and it moves to the front of the queue.
More episodes
More from Programming By Stealth
PBS Tidbit 19B — Building a JavaScript CLI App with NodeJS
Programming By Stealth
PBS Tidbit 19A — Building a JavaScript CLI App with NodeJS
Programming By Stealth
PBS 186 of X — Web Metadata — the Search and OpenGraph HTML Headers
Programming By Stealth
PBS 185 of X: Customising Bootstrap 5 with Sass
Programming By Stealth