Video
Git Tips - How to Handle (and Avoid) Merge Conflicts
Skills that you will get in this material