]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3a25f76) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 17 Jan 2024 01:13:46 +0000 (01:13 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 17 Jan 2024 01:13:46 +0000 (01:13 +0000)
commit18cd42837f746984ae603513995c07fac8636b75
treea4a553d4e6de04a787cc5f1dcf0acb87a074ac4btree
parent3a25f7628cf51dc1314adf4086f69baa8b6c7952commit | 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/dolphinpart.json.in diff | blob | blame | history
src/dolphinpartactions.desktop diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history