]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 265a149) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 28 May 2025 01:34:23 +0000 (01:34 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 28 May 2025 01:34:23 +0000 (01:34 +0000)
commit0959642be297bf0749467c204e511f5887b17ee1
tree8860ef148a5f911f9f9d780c6f17ac61efed45d9tree
parent265a1495a27e4ee4b36357a1eae7ca2b17f7976acommit | 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