]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0d981e7) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 9 Jul 2024 01:19:12 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 9 Jul 2024 01:19:12 +0000 (01:19 +0000)
commit22de178ad6001451eaa7e0cbf46801a18b027695
tree9cce95b4bf2795e1b30e68b3c0a388e3fbedf073tree
parent0d981e7b7df266c867004e23a169ba8cc13c8683commit | 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