Git Merge

Pravesh Vyas — Thu, 12 Aug 2021 19:01:23 +0000

Git Merge, It is one of those concepts that newbies Barely use, These are Majorly used in cases where we need to development on a Experimental feature or Want to try something which we don't like to ship. The Idea of Merging two separate branches to one always fascinated me, But I always use to think How would Merge Conflicts be resolved in a case Where things don't add Up or we have a file which has two different version on two separate branches. Lets see How Merging Works in Git.

According to definition

Git merge will combine multiple sequences of commits into one unified history. In the most frequent use cases, git merge is used to combine two branches. The following examples in this document will focus on this branch merging pattern. In these scenarios, git merge takes two commit pointers, usually the branch tips, and will find a common base commit between them. Once Git finds a common base commit it will create a new "merge commit" that combines the changes of each queued merge commit sequence.

In the above image we can see that there is a Common base between the Two Points we want to Merge, What happens here is Git Diffs Both the Branches Against there Common Ancestor and Calculates Changes based on it.

Types Of Merges

Fast Forward Merge.

It occurs when there's a direct path between the current branch tip and the Current Tip. It Basically merges the history of Both the Tips.
3 way merge

This Happens when there's no direct path between the Main and Current Branch. The Name comes from the Fact that git uses three commits to get make the merge commit it combines the source, feature and common base to come to a new merged commit .

In a three way there could conflicts to files changes in the both the Tips

Conflict Resolution

To resolve them what we need to do is change the files and Use the Command

Git Add

and then

GIt Commit -m "SomeThing here"

To get the Tips Merges

and it will create the Merged Branch.

Various Commands that can help in resolution of conflicts.

git log —merge

It helps in producing the list of command that are causing the conflicts

git Diff

It helps in finding the difference between files between two States

Git merge —abort

It helps by ending the merge process returns the repo into the original state as it was before merging happened.

That Sums up how merging Works Across Branches.

React From 33000ft

Pravesh Vyas — Thu, 12 Aug 2021 10:41:11 +0000

Hi Folks, It's 2021, We all agree on the fact that React Came out as the most popular Library in JavaScript Scene for Good Enough Time. In my reasoning It came on top Because, It was meant for scale people at Facebook, Designed It in a way that really solves a critical problem, of all the models of time, Which is Re Rendering on the smallest of changes that occur some where deep inside the Tree. This use to cause Cascading Changes in DOM, Which would make code unreliable for Devs to Change on, Nobody would be interested to do changes in such a messy system, Which in turn causes Dev Processes so slow down.

Now that you have Heard the Story lets look, In to Tech that Enabled this, If you go to React's Home page you would see the Following things

Declarative

To understand this we need to Understand what's the Difference between a declarative and imperative way of doing Things.

In a Nutshell, We can say that, We are choosing to Loose control over Control Flow to make our code more Reusable and Performant , There's a Saying that you take better decisions by not Taking decisions at all.

For getting More detailed Perview Head on to

So yeah, They Unknowingly choose this way of doing Things.

Component Based System

FaceBook had Been Playing around with these sort of things for a long till they got to React, They had a php Extension called Xhp, Which got you out from the hassle of Opening and closing <?php> Tags all around the code

They introduced a New type of Syntax where they passed Html elements as functions. It worked out great for them. The Above extension also had a feature of Making Components, Which directly impacted the contributed to the creation of Component based System.

Virtual Dom

Before understanding Virtual Dom, Lets get hang of DOM. It stands for Document object model, It basically represents the UI of the whole App as a Tree Data Structure. It all works Fine and good until you add Complex Functionality to the App. To solve this What React Developers Did Was they introduced a Virtual Dom which Calculates and Process everything that Real Dom would do whenever a change happens. And choose a way in which Least manipulation will Happen in the DOM and Hence Cause a Better end User Experience

More About V-Dom

Server Side Rendering

Its is one of those Features That Comes out of the box in React, What happens here is the app Pre Renders the Whole HTML of the Page and Sends it to the Client, Reducing the Render Cost that comes on to the user, It also Is used Heavily when we are interacting with constantly changing data, These Days People are Using NexT.js and NuxT.js For Complex Apps. Which Work on the Above Principle

This Sums Up the Core Features of React, I think Nothing Can Go as Big as React, Without the contribution from community

Which Caused it become How Popular it is today, Of course It Wouldn't have been possible without the Opensource Community we have around it.

DEV Community: Pravesh Vyas