Motivation Hello, I'm Omar Alaa, a Mobile Software Engineer. I am writing this article because merge conflicts have always been a very scary topic to...