Resolve Merge Conflicts In Git

Start Course
level
Introductory
Subject
Software Development
Course Length
1 hour
Subscription
Foundation

Course Description

If you are working on a team, using Git for source control, it is nearly inevitable: You will experience merge conflicts. In this course, you will learn what merge conflicts are, how to resolve them, and how to minimize their impact on your project.

Requirements

  • An understanding of the role of source control in the software development process.
  • Installing Git tools

Instructors

Wallace Kelly

Wallace Kelly has been teaching software development for about 14 years, focusing mostly on .Net, including C#, F# and WPF. His passion for teaching started as a little kid when other parents would hire him to teach programming to their kids. Wallace is an experienced, interdisciplinary researcher and program manager. He has vast expertise in intelligent systems, software development, and innovating for next-generation systems. He'll bring this diverse, real-world experience to you as he introduces you to programming basics.