Video: How to resolve Git merge conflicts

Practical step by step guide to find inspect and fix Git merge conflicts using commands and simple merge tools to keep a clean repository history