]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 787fa3e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 26 Nov 2023 02:33:09 +0000 (02:33 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 26 Nov 2023 02:33:09 +0000 (02:33 +0000)
commite5387d148140d2b5c6569fee0c0e8935cf9a0144
tree7596d181cec0153d51c11e168e44ddbb76798220tree
parent787fa3eebdeeb2707a78d9e72a082f89c2e05bb2commit | 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/org.kde.dolphin.desktop diff | blob | blame | history