Merge branch

For terminal

having the branches ready for the merge, we write the following command being in the branch that we want to merge the branch with the changes.

    git merge --no-ff <test-brach-name>

if there were no conflicts, apply the following command

    git push

check in the branch that merged the changes if the changes are found.

For VS code.

having the branches ready for the merge, we write the following command being in the branch that we want to merge the branch with the changes.

We go to the 3 points and then follow the next path.

Branch -> merge branch

An image

a modal will open and we choose the branch that we are going to merge.

An image

Once we click on the branch name, the merge will be done.

If it does not mark conflicts, it only remains to press the button 'Sync Changes'.

.

Check in the branch that merged the changes if the changes are found.

Merge with git graph

Open your Git Graph and change to the branch you want to merge to. Here we are in the dev-branch:

Select the branch you want to merge and click-right.

Select Merge into current branch and accept merge.