Git: merge request manually

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

git fetch origin
git checkout -b patch-1 origin/patch-1

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff patch-1

Step 4. Push the result of the merge to GitLab

git push origin master

Git: ummapping packed-refs

Der Fehler fatal: error ummapping packed-refs file .git/packed-refs: Invalid argument konnte mit den folgenden Befehlen im Arbeitsverzeichnis behoben werden.

$ rm .git/packed-refs
$ git fsck
$ git gc