AI-powered
podcast player
Listen to all your favourite podcasts with AI-powered features
What's a Conflict?
conflict or resolution is something that takes place, typically when you're merging or pulling in code where code has been modified somewhere else. When a line of code a is changed, and it's not necessarily the same line, because gid is very good about figuring out how to work together. And i then you have to man nally do that yourself, because kit has no idea. I'm glad you managed to get food into this episode. That's great. We have a good track ortheare here going o,. Whether it's under the hood or its sandwich building or something, we are, we have prty track record there. Is almost never something i slike, sometimes i