]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc3973a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 11 Nov 2024 01:26:29 +0000 (01:26 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 11 Nov 2024 01:26:29 +0000 (01:26 +0000)
commitd68a59865ed764bdd9743f4603a4be40c920e433
treef935ea850f1de50c51b51ea9406374e240dbddf2tree
parentbc3973a6c448487efbba41b0b3b6bbd260cb7e42commit | 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