]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0dac70d) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 6 Feb 2022 01:58:24 +0000 (01:58 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 6 Feb 2022 01:58:24 +0000 (01:58 +0000)
commit32c072fe5f78efbcb76187ed535190d3a0e869f3
treee3da3b55f0585118edeb98c575b4ae342232fad0tree
parent0dac70d059551ad143b9bb9849efb28840b7ba4bcommit | 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