]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b625a44) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 10 Jan 2024 02:08:59 +0000 (02:08 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 10 Jan 2024 02:08:59 +0000 (02:08 +0000)
commit7e02110c64b178f16519ee3be6a4d460e967236d
tree45c994da72222871f9a7e87e830d69690f70f95dtree
parentb625a44a697f863aad92b7cf9c67548c84bc262dcommit | 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/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history