]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 13d212f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 27 Jul 2025 01:34:32 +0000 (01:34 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 27 Jul 2025 01:34:32 +0000 (01:34 +0000)
commite48bb0405ec431cf9f6048981ca08d3dcfbeeba7
tree1f76d04766b3cb4e39ab4e7961c2fdd0aeec52dbtree
parent13d212fa417ce811aa9778bafdaa025059ed373bcommit | 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/itemactions/setfoldericonitemaction.json diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history