]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4a3ddf2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 30 Jan 2023 02:05:00 +0000 (02:05 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 30 Jan 2023 02:05:00 +0000 (02:05 +0000)
commit572f4d2e9ac5dcb188630281227b545af41275bb
tree693701774ce7aa9eb758e8b0366fb927f5aea742tree
parent4a3ddf29f96d935c0a8e550f7a32d94d74eb8b39commit | 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