]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5a6168f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 12 Jun 2025 01:33:48 +0000 (01:33 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 12 Jun 2025 01:33:48 +0000 (01:33 +0000)
commitd4e8b06b0ff824e3e3bb3a397b9379eee1bea929
treeb1716b729f1b1143382038f47b2bcdff4b8eef60tree
parent5a6168fec145064c14d6e95c6626a28bd481df43commit | 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