Getting Started with Git

Aug 14 2023 · git 2.28, console

Part 1: Getting Started with Git

07. Resolve Conflicts

Episode complete

Play next episode

About this episode

Leave a rating/review

See forum comments
Cinema mode Mark complete Download course materials
Previous episode: 06. Create a Pull Request Next episode: 08. Organizing Your Commit

Get immediate access to this and 4,000+ other videos and books.

Take your career further with a Kodeco Personal Plan. With unlimited access to over 40+ books and 4,000+ professional videos in a single subscription, it's simply the best investment you can make in your development career.

Learn more Already a subscriber? Sign in.

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 as obfuscated text.

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.