]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0ccc154) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 1 Aug 2025 01:37:09 +0000 (01:37 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 1 Aug 2025 01:37:09 +0000 (01:37 +0000)
commite1b325a867ede95c5815ca11998017c67fc78ea9
tree7c11b381ba303c2ef4d001bc1adcd3c72f50519etree
parent0ccc15422da4d7b8455ae988aed2ae38734ac96ecommit | 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