]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e112fc5) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 1 Jul 2025 01:33:47 +0000 (01:33 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 1 Jul 2025 01:33:47 +0000 (01:33 +0000)
commita5732d5caa262d092be00f5ec52bb7c2e90a2982
treecc326d0f3fa6288369ee9ce7cc9e955feef8788ftree
parente112fc50e0577449990746e1718b79e54748b61fcommit | 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