Conflict Resolution in Git by Robert Walker

CocoaHead Robert Walker, the Atlanta chapter’s resident Git guru, has done it again with another wonderful screencast.

This time, Robert talks us through resolving merge conflicts in Git.

Provided by CocoaHeads Atlanta.