]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4cd1b6f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 28 May 2022 02:27:04 +0000 (02:27 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 28 May 2022 02:27:04 +0000 (02:27 +0000)
commit734df72e900f500e091a815bf557898b7c302e07
treed8baa2aab2e8943fb3100d78fd40b79c187b74aetree
parent4cd1b6f9ff2d4aa6304f189121ef8d1ac3783cfbcommit | 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
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history