]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e369766) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 18 Jul 2025 01:33:39 +0000 (01:33 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 18 Jul 2025 01:33:39 +0000 (01:33 +0000)
commitd955a72c0ccbae65a629d5f86db4fdb305ccfef4
tree1518ee47603d66b6d6f5152a0b72740d8dc39722tree
parente36976633ca9c6fa60255174b1f4035c092ef309commit | 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