]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 82c859a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 14 Jun 2025 01:34:10 +0000 (01:34 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 14 Jun 2025 01:34:10 +0000 (01:34 +0000)
commitbd839796f1e165016f8a4dfd01b222b31fb7773f
tree16ccfd510f6477693d6b2470cfdeaa46d59de5c4tree
parent82c859a0863dc861011d4c362580888b5d6add33commit | 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/itemactions/setfoldericonitemaction.json diff | blob | blame | history