Supplementary - Git - Conflicts, Branches, Merging and Tags
This explains branches, merging and tags and show how conflicts may be resolved.
Length : 00:20:50
Video in ogv format : gitmerging.ogv
Video in mp4 format : gitmerging.mp4
Slides: ( gitmerging.slides.pdf)