Getting started with Git using SourceTree - Part 4: Solving conflicts

This video series teaches you Git version control without having to use the command line. As an interface, we use SourceTree from Atlassian and KDiff3 by Joachim Eibl. Part 4 covers changes made by different people to the same regions in a file: conflicts, and how to solve them. (We are not affiliated with Atlassian or Joachim Eibl in any way.)