Merge Conflicts for beginners

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 me and I had to google the approach for resolving these conflicts each time I ran into a conflict. ...