Lesson 5: Resolve a conflict in Advanced mode

In this lesson, you will watch a demonstration about how to resolve a change that conflicts with the changes that another team member delivered to the team stream.

About this task

Note: This content was created for a specific release, but also applies to later releases.