The Battle of Git Merge Conflict by InnerSophist
When the main branch and feature branch go to war, and you’re stuck in the middle. Git Merge Conflict...
Tags: github, beginners, funny, devops