Explaining Git Merge and Conflicts to a 5 year old

Git merge and resolving resulting conflicts could be one hell of a concept to wrap your head around. In this short post, I have attempted to explain git merge and conflict resolution without use of technical jargon. The analogy takes inspiration from events of our day to day lives which, hopefully, everyone can relate to. In …

Explaining Git Merge and Conflicts to a 5 year old Read More »