Video Series

Learning Git with Tower

Dealing with Merge Conflicts

How do I resolve a merge conflict?