[S01E01] Understanding Their Meme: The Scariest Things on Earth
Hello everyone, welcome to my all-new series called " Understanding Their Meme ". This series is based on explaining programming/ developer memes to beginners or someone who is not introduced to development yet. Let's start this series with the first meme: *drums rolling* Tada! In this meme, they have conveyed " merge conflict " to be the " scariest things " on Earth. Now, what is this " merge conflict ". If you have tried your hands with Git or GitHub or any other Version Control System, you would know what this is but sometimes its possible you might have not experienced this yet. Let's first define it and then I will show you an example to better understand it. Definition : A merge conflict is an event that occurs when Git is unable to automatically resolve difference or changes in code or files between two commits. Git can merge the changes automatically only if the commits are on different lines or branches. Now, lets understand t...