]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0d35d89) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 12 Dec 2021 01:48:07 +0000 (01:48 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 12 Dec 2021 01:48:07 +0000 (01:48 +0000)
commitfbe1ecaa6ab2f96cfdd30cb61bea618de57c29e9
tree03e83cf0fb488aee832d8a86fdd024b557791aeetree
parent0d35d8963a40d4da0b8b31c5c2406e60921e9e30commit | 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