]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85f218e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 28 Jun 2025 01:34:05 +0000 (01:34 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 28 Jun 2025 01:34:05 +0000 (01:34 +0000)
commit64f38f89a63c7afe5fbd5181f9de65c4b3be48b7
treea17343cf3b8afb9c5612c4115a1186cce5b8e4e1tree
parent85f218e24f2af3f65274c64e876cee807c54b5a2commit | 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