]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f62b05) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 20 Dec 2021 01:45:56 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 20 Dec 2021 01:45:56 +0000 (01:45 +0000)
commitb38d7150d99f4aa611e0b103bae2eef7b1d3171e
tree2629f51e256df9ee76d4ba7d225d1aa264968cabtree
parent2f62b054eabffb657976f94abd49c6445878b647commit | 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