Articles → GIT → merge command in git

merge command in git

In this article, we will discuss about merge command in git.

Purpose

When we are merging from source branch to target. It means that we are overriding the files of source branch to target branch.

Syntax

To merge the changes

1. Go to the target branch using following syntax

git checkout <target branch>

2. Use merge command

Git merge <source branch>

Example

Let us assume that we have 2 branches i.e. master and dev. Let us work on a table

Branch	Operation	After merge with other branch
Master	Create an empty text file 1.txt	An empty text file 1.txt is created in dev.
Master	Text added in 1.txt	Same text will be added in dev. Branch.
Dev.	1. Change in 1.txt 2. Created 2.txt	1. Changes of 1.txt will be overridden. 2.2.txt gets created.
Dev	Delete 1.txt	File gets deleted in master branch as well.

What will happen to untracked and files in staging area?

1. If there is any untracked file in one branch then it will also appear as untracked file in another branch.

2. If there is any file in the staging area then it will gets copied to another branch once you switch.

Posted By -	Karan Gupta

Posted On -	Friday, August 02, 2019

Query/Feedback

Your Email Id

Subject

Query/Feedback	Characters remaining 250