]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5539632) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 27 May 2025 01:32:44 +0000 (01:32 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 27 May 2025 01:32:44 +0000 (01:32 +0000)
commit265a1495a27e4ee4b36357a1eae7ca2b17f7976a
tree298e4da8a8f2e9b11f54ca3bb7e467418d6fbb89tree
parent5539632e2a442eaf497b0ea6265ed1abac888821commit | 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