]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3366f62) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 7 Mar 2022 01:44:55 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 7 Mar 2022 01:44:55 +0000 (01:44 +0000)
commit7c6a34222c75b969882ab89a290a0a1ac9b481a3
tree11eba68a5596d9e9dc5549399e1ded9c362509f2tree
parent3366f62b0979752249a7e38769c318c72100aac6commit | 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