Lesson 4: Resolve a conflict
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.