Issue/T261344

Refs: https://phabricator.wikimedia.org/T261344

wiki@sulcorebutia:/../w$ git fetch "https://gerrit.wikimedia.org/r/mediawiki/core" refs/changes/56/622656/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 3265, done
remote: Finding sources: 100% (10/10)
remote: Total 10 (delta 9), reused 10 (delta 9)
Unpacking objects: 100% (10/10), done.
From https://gerrit.wikimedia.org/r/mediawiki/core
 * branch                  refs/changes/56/622656/1 -> FETCH_HEAD
error: could not apply 164a08724d... Rest: Use try/catch to handle URIs with embedded colon
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

wiki@sulcorebutia:/../w$ git fetch "https://gerrit.wikimedia.org/r/mediawiki/core" refs/changes/56/622656/5 && git cherry-pick FETCH_HEAD
remote: Counting objects: 3265, done
remote: Finding sources: 100% (10/10)
remote: Total 10 (delta 9), reused 10 (delta 9)
Unpacking objects: 100% (10/10), done.
From https://gerrit.wikimedia.org/r/mediawiki/core
 * branch                  refs/changes/56/622656/5 -> FETCH_HEAD
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed