]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3e4d9ca) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 1 Jun 2025 01:36:41 +0000 (01:36 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 1 Jun 2025 01:36:41 +0000 (01:36 +0000)
commit41c7a9267f32424eda40c73ff691688173a47dbe
treec8699d5f86d4d4874afefe81f6300fd44b8f3111tree
parent3e4d9ca10c33746cb545e930886491e6a1227e6ecommit | 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