]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 710d9af) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 3 Jul 2022 01:59:38 +0000 (01:59 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 3 Jul 2022 01:59:38 +0000 (01:59 +0000)
commit7b4644c0842697b8fb56f23dbce6d7fcc6fec67e
treea5bcc72dad82bdac6361f2a0d3b58f62e241b6a6tree
parent710d9af234c7990d7117431be901a9e483c63d3fcommit | 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