Step 1.
Checkout the branch we are going to merge and pull in the code
git checkout -b efernandez/websocketho-master master
git pull http://git.focasoftware.com/efernandez/websocketho.git master
Step 2.
Merge the branch and push the changes to GitLab
git checkout master
git merge --no-ff efernandez/websocketho-master
git push origin master