]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e57f621) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 22 Jun 2025 01:35:32 +0000 (01:35 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 22 Jun 2025 01:35:32 +0000 (01:35 +0000)
commit9f233850beb60168e8773623e0b5ae052c5287e9
tree3b54b4aaed4f493f3657d565627a155ca60c8813tree
parente57f6215659ee36877c7c36c9e3fcba0ba5d03a0commit | 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