]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2c91112) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 7 May 2022 01:45:00 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 7 May 2022 01:45:00 +0000 (01:45 +0000)
commit2e333e1b9784b2d04b056e9b1a8e6ddb058584fd
tree5c69079f52704ef45620edf7aabd9afd4241ccc1tree
parent2c91112c61a5c32fe278511b119804107ceadcddcommit | 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/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history