#git branching #git merge #version control magic #git insight #complex git fix #gitfu