]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 483faa0) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 11 Jun 2025 01:35:45 +0000 (01:35 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 11 Jun 2025 01:35:45 +0000 (01:35 +0000)
commit7212513034b1181cc8efd439bb3ccde5481a3ecd
treee86f26eba193e1c4138f146c3c581ebc7a5f9933tree
parent483faa05cf265615f9a896171122c473477ec6a3commit | 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
src/org.kde.dolphin.desktop diff | blob | blame | history