]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2de8f4c) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 5 Apr 2022 02:58:27 +0000 (02:58 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 5 Apr 2022 02:58:27 +0000 (02:58 +0000)
commit50c3be0ca0645d81dd10bde8441dc593b237c0d1
treee0118cb62a9d2158330bbb6e6c4390282ea8789atree
parent2de8f4c0fb2141f68400327a4f87eefa71d81e3ccommit | 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