Git scenario cheat sheet
Merge
git merge new_feature
Let's say, we want to copy all the code from
new_feature
branch intodev
branch.In such a situation, first, we have to
checkout
indev
branch then we can execute the above command.The above command means bringing all the changes from
new_feature
branch into the current branch.Note: always pull before any merge i.e. after
git checkout test
do a pull requestgit pull
after that dogit merge new_feature