]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6b17e85) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 26 May 2025 01:33:43 +0000 (01:33 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 26 May 2025 01:33:43 +0000 (01:33 +0000)
commitb0a9907b9cb18e7c1a566f67a90206f067b7eb5e
treedc7cfb14f3d7f4033365c34911608a007a66ea42tree
parent6b17e856d2bfe875731386517083958c2d6f02e8commit | 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