]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8079e8a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 28 Jul 2025 01:32:54 +0000 (01:32 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 28 Jul 2025 01:32:54 +0000 (01:32 +0000)
commitb1b743c59c48f54378abc46ff055d221b68cb433
tree9312a6095e6f555580b31aea6c0cd573cfa7248atree
parent8079e8a5f0496febf39e6090c3898ad0aa4d8e9dcommit | 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