]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ce7852f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 5 Feb 2022 01:47:47 +0000 (01:47 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 5 Feb 2022 01:47:47 +0000 (01:47 +0000)
commitcd6664c5695af0556ed8b178791e70a8f902eb20
tree8d342abbf80e8a9d1dd34e11661b914a568c609btree
parentce7852fb2352155e4373f9a41f0a01549985bd45commit | 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