SVN_SILENT made messages (.desktop file) - always resolve ours
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"

KDE/dferry,KDE/dferry