]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 245ae05) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 15 Jun 2025 01:33:49 +0000 (01:33 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 15 Jun 2025 01:33:49 +0000 (01:33 +0000)
commit5c71e6189488ca3e3f28c45e274f67f77c7cdfed
treee3c3bd10c83860a6c68e52a3ecfbc8f65318d1abtree
parent245ae05f8016c2cbf8cd877ca9ddf5d57ed236d9commit | 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