]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fede209) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 21 Sep 2022 01:48:38 +0000 (01:48 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 21 Sep 2022 01:48:38 +0000 (01:48 +0000)
commit6c65d06bcd4b34ef7a82203b3ba06b6c3604986b
tree8bc1c4ec57ab20e55f92e16f518f42bbe91b34b5tree
parentfede2094e3ffb1e4ba738727af1832b6bdd3fe35commit | 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/dolphinpart.json.in diff | blob | blame | history
src/dolphinpartactions.desktop diff | blob | blame | history
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