]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b4e3c26) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 15 Dec 2021 01:57:54 +0000 (01:57 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 15 Dec 2021 01:57:54 +0000 (01:57 +0000)
commit1421af70eb8efd7dedf352bc46c8afcff564fc9a
tree0d0a3b4affe8942868b970b678db585ead1ef3a1tree
parentb4e3c2645eb2c018e36e8785a58dad39e9d29887commit | 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