]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ee76ae8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 7 Jun 2022 02:25:10 +0000 (02:25 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 7 Jun 2022 02:25:10 +0000 (02:25 +0000)
commite406bc197fc0116d7fd8bb62086b41c52417c948
treed4fc3528974379f8c6b6837b1fbadf4c7d8025cctree
parentee76ae866ecebe22667ac8227853ca711be5c2c7commit | 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