[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 this by an example:

Let's imagine, there are two developers and both of them pull ( download ) the same file or code from the same remote repository. Now they might be working on different system but they are making changes to the same file under same remote repository. Now when Developer Nikita tried to push back the file from her local repository to remote repository, she is able to do so but when Developer Herika tried to push back different version of that file, she is unable to do so. That is because her version of the file before making any changes is different from what's there in the remote repository now which contains changes made by Nikita. Confusing?

Lets simplify this process (both are working on same branch):

1. Nikita and Herika download the file, Hello.js which contains just one line: console.log("Hello");

2. Nikita quickly make changes to Hello.js by adding another line: console.log("Nikita");



3. Nikita pushes changes to remote repository, which changes the contents of Hello.js from one line of code to two lines of code.

4. On other hand, Herika is making changes to same file and adds her line:



5. Now when Herika tries to push this file to remote repository, Git stops the process as it expects Nikita's version but instead it is getting the original Hello.js for changes.


And this is called as MERGE CONFLICT.

To avoid such situations, developers work in separate isolated branches.

Coming back to the meme, its gets scary when you work in larger teams or big projects.



Comments

Post a Comment

Popular

How To Create MySQL Table with SequelizeJS

Image
Hello, in this post I will be showing how you can create an SQL table using JavaScript without the knowledge of MySQL. Sequelize is a promise-based  Node.js   ORM tool  for  Postgres ,  MySQL ,  MariaDB ,  SQLite ,  Microsoft SQL Server ,  Amazon Redshift  and  Snowflake’s Data Cloud . It features solid transaction support, relations, eager and lazy loading, read replication and more.
OPEN

How To Read CSV Files in Java as Maven Project

Image
Many of us have problems reading CSV files in Java but not anymore!. In this guide, I will share how to read CSV files as Maven Project. For creating a Maven project: In your Eclipse IDE, click on File > New > Project... > Maven >Maven Project > Next > Check "Create a simple project" checkbox. Under Group Id: The name could be anything. It is same as any package name. E.g. in.sumitkp Under Artifact Id: Same as above It is same as any project name. E.g. maven-demo1 Let the Version be the default. Under Name: Give the name for your project Click Finish. In your Project Explorer, all the necessary files will be automatically generated. Inside the root folder, there will be an XML file auto-generated called  pom.xml . About pom.xml: POM stands for Project Object Model It is an XML file that contains information about the project and configuration details used by Maven to build the project. When running a task, Maven looks for the pom.xml file in the directory. I...
OPEN

How To Create A Hibernate Project in Maven

Image
In this post, I will be showing you how to create a Hibernate project using Maven and how we can add MySQL dependencies to it. Here, is a whole process picture which you can click and follow the steps. The direction of the process has been indicated by arrow icons. Now, configuring the Hibernate XML file: Inside your project folder, right-click on 'src/main/java' and select New > Other... > Type filter text: xml > Under XML folder, click on XML File > Click Next > Under File Name, type: hibernate.cfg.xml > Finish. Inside this hibernate.cfg.xml file, we would now need a dtd line. dtd stands for 'document type definition'. It defines the tagging structure of an XML document. For this, search on Google or any search engine: hibernate dtd. Find for the result that says "Index of /dtd - Hibernate". Click the link or go to  https://hibernate.org/dtd/  . On the next page, click on either of these three links. A dtd file will be downloaded. Open the ...
OPEN