Getting Started with Git
Aug 14 2023 · git 2.28, console
Part 1: Getting Started with Git
07. Resolve Conflicts
Notes: 07. Resolve Conflicts
The merge changes video will cover happy path. This video will show what changes can look like if multiple people are working in the same file.
Heads up... You've reached locked video content where the transcript will be shown astext.
Eventually once you start working with more team members on a project, you’re going to have merge conflicts. This can happen when one developer updates the same file you were updating. Let’s simulate that so you can see how to resolve those conflicts.