]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 78753ad) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 20 Feb 2022 01:50:36 +0000 (01:50 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 20 Feb 2022 01:50:36 +0000 (01:50 +0000)
commitd774088a52b04a28d4e9fc0ae894ac6477d060e0
treec89b98504e781a0f6a89a6c95d2f6ffe8946674dtree
parent78753ad23c3540f9e470bab03630e25c22dd2d3ccommit | 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