SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
1 job for 5.4 in 60 minutes (queued for 1 second)
Status Job ID Name Coverage
failed #13958
linux stable-kf5-qt5 qt5.12


Name Stage Failure
linux stable-kf5-qt5 qt5.12 Build The script exceeded the maximum execution time set for the job
kf5.kinit.klauncher: new app "org.kdevelop.kdevplatform-lock-14ee06f9-2297-44c4-8403-673cda0437dd"
62/121 Test #62: test_itemrepositoryregistry_automatic ... Passed 5.25 sec
Start 63: test_itemrepositoryregistry_deferred
kf5.kinit.klauncher: new app ":1.34"
kf5.kinit.klauncher: new app "org.kdevelop.kdevplatform-lock-2857558c-9272-47f5-92a5-ed4709bc5c67"
63/121 Test #63: test_itemrepositoryregistry_deferred .... Passed 4.91 sec
Start 64: test_indexedstring
Pulling docker image gitlab/gitlab-runner-helper:x86_64-ac2a293c ...
ERROR: Job failed: execution took longer than 1h0m0s seconds