Articles → GIT → merge command in git
merge command in git
|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?