Getting started with Git using SourceTree - Part 3: Working on the same files

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 3 covers working together on the same files: Merging files. (We are not affiliated with Atlassian or Joachim Eibl in any way.)