]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 734df72) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 29 May 2022 01:46:43 +0000 (01:46 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 29 May 2022 01:46:43 +0000 (01:46 +0000)
commit1fc3108f1444df18600bebc8bee11972d164ccf1
tree52a761c99f691e761559617819e826cae142b595tree
parent734df72e900f500e091a815bf557898b7c302e07commit | 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/dolphinpart.json.in diff | blob | blame | history