]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 33d8c89) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 8 Nov 2023 09:18:27 +0000 (09:18 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 8 Nov 2023 09:18:27 +0000 (09:18 +0000)
commit3fde6cbeb0b2df48a91870c74c4ef74462a82058
tree8ec7df75dfc2fb7725fd8e796e10956b7c104441tree
parent33d8c894f25958d3024bef8d9be3d9f880923056commit | 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/kcmdolphinviewmodes.json diff | blob | blame | history