]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3207ed3) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 9 Jun 2022 02:11:47 +0000 (02:11 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 9 Jun 2022 02:11:47 +0000 (02:11 +0000)
commiteb4a3cb45a18a46649da9145cbe2fef73fd38ca6
tree884b87e68483be712ec2e546451938b7cf723701tree
parent3207ed3b97b8394192e58b89731b975d4230096fcommit | diff
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"
src/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history