]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 513fe3b) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 15 Jul 2022 01:51:02 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 15 Jul 2022 01:51:02 +0000 (01:51 +0000)
commitd4ed58f6a920cc9887208ea9264e0f0da618835e
treeceb414fe72a77fcc53502584ee55012b99e6f669tree
parent513fe3bb428c9d10f40a93efeca60fbf95d89beccommit | 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