]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 149c043) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 2 Jun 2025 01:32:45 +0000 (01:32 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 2 Jun 2025 01:32:45 +0000 (01:32 +0000)
commit57615e7ba2c7702321684c56fa2a86d65b7eee4b
treea34cdb92af9c1442743694cc3b976d7328305e69tree
parent149c043c59f0b99d13919bfec4f86baaded3cf16commit | 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