]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 58ff9c9) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 20 Oct 2022 02:11:03 +0000 (02:11 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 20 Oct 2022 02:11:03 +0000 (02:11 +0000)
commit3333246dba8df1da7f0e735c7816efbce270c96a
treeb8ae20ea3aeac484dbccdfc5da09f227c3108efftree
parent58ff9c9cc8f6023f484fd4dbf436e4f598b9fad4commit | 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/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history