]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 567bc71) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 31 May 2025 01:34:21 +0000 (01:34 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 31 May 2025 01:34:21 +0000 (01:34 +0000)
commita1c9bc5595a21299dab9260c6a77c0561c95c8ba
treefb7dfd89db108155507009d386ba975e0e365693tree
parent567bc7176042eb4b41ed56a276c95ab2029782ddcommit | 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