Story: Software That Doesn't Suck With Jim Blandy
CoRecursive: Coding Stories
00:00
Is There a Difference Between Distributed and Distributed?
The great thing about merging in git adi'll just pick that as an example, but merterial is the same. There's no restriction on what amerge means. All you need to do is have some good textual merge tools and use whatever heuristics they want. Whatever huris, iks work well for your project. We'll have some off the shelf burgers that tat do a great job in most cases. But if you want to have a specialized tool, you just drop yours in,. You caun do whatever you want, and then when you say it's ok, that's the end of the story. It doesn't seem like there's some reason that
Transcript
Play full episode
