]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66505d6) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 2 Jul 2022 02:06:49 +0000 (02:06 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 2 Jul 2022 02:06:49 +0000 (02:06 +0000)
commit58a7772a19204f467432d098253a32f0fc705b34
tree8f568f96ce4d09e00deb4379b6c0c0af939d3a19tree
parent66505d643cb1612cdcf13743de6f8999225fa93ccommit | 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.desktop.in diff | blob | blame | history
src/dolphinpart.json.in 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
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history