]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b6e47b4) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 18 Feb 2022 01:51:42 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 18 Feb 2022 01:51:42 +0000 (01:51 +0000)
commit78753ad23c3540f9e470bab03630e25c22dd2d3c
tree1c71e93fe0d61a849f753dccee9fec08351fb423tree
parentb6e47b47508ac6c699c2a841175912ea2a2d9d2bcommit | 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