]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9a334ca) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 9 Apr 2022 01:51:05 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 9 Apr 2022 01:51:05 +0000 (01:51 +0000)
commitc4092e9047adb04895e007013be50fe50bf40f67
tree6546e0def1e3dc086b9a4aa48bbe44667362f038tree
parent9a334caf7d46f5d87079545bd2e67df13a56ed56commit | 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