How to Merge branches

The merging is available in terminal on local computer only

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "<branch_name>" "origin/<branch_name>" 

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master" // If we want to merge into master. You should use ""origin/<branch_name>" - for merging into your branch
git merge --no-ff "<branch_name>" // For exammple we want to merege branch "dev" into "master", we text: git merge --no-ff "dev"

Step 3.2. Show terminal for merge commit

• press “i”
• write your merge message
• press “esc”
• write “:wq”
• then press enter

Step 4. Push the result of the merge to GitLab

git push origin "master" // or:  git push origin <branch_name> if you merge into <branch_name>