Git Merge Conflicts Explained with Timeline Branching

Introduction What if humanity had a machine that could create alternate timelines to test different futures before committing to one? This blog uses one such story to explain Git merge conflicts ( Yes, we are going to be talking about Git in this sto...