What's a Conflict?

4min Snip

00:00

Play full episode

Summary

Transcript

Episode notes

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

In this episode of Syntax, Wes and Scott talk all about how they use Git inside of VS Code, extensions they use, and the various ways to interact with Git in VS Code.

Linode - Sponsor

Whether you’re working on a personal project or managing enterprise infrastructure, you deserve simple, affordable, and accessible cloud computing solutions that allow you to take your project to the next level. Simplify your cloud infrastructure with Linode’s Linux virtual machines and develop, deploy, and scale your modern applications faster and easier. Get started on Linode today with a $100 in free credit for listeners of Syntax. You can find all the details at linode.com/syntax. Linode has 11 global data centers and provides 24/7/365 human support with no tiers or hand-offs regardless of your plan size. In addition to shared and dedicated compute instances, you can use your $100 in credit on S3-compatible object storage, Managed Kubernetes, and more. Visit linode.com/syntax and click on the “Create Free Account” button to get started.

SPONSOR - Sponsor

LogRocket lets you replay what users do on your site, helping you reproduce bugs and fix issues faster. It’s an exception tracker, a session re-player and a performance monitor. Get 14 days free at logrocket.com/syntax.

SPONSOR - Sponsor

Get a 30 day free trial of Freshbooks at freshbooks.com/syntax

Show Notes