Git resolve conflicts

gistfile1.txt

Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request 

git fetch origin
git checkout -b dev/bugfix/tags_ellipsis origin/dev/bugfix/tags_ellipsis

 Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up 
git checkout development
git merge --no-ff dev/bugfix/tags_ellipsis

Step 4. Push the result of the merge to GitLab 

git push origin development