]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fde79c0) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 7 Dec 2021 01:46:49 +0000 (01:46 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 7 Dec 2021 01:46:49 +0000 (01:46 +0000)
commit01e2a0446752e8ae7e43043006693086b54d7656
tree56447036930835af3992a45d49366e6eb06f5bf2tree
parentfde79c09cb9ae5991d6b36c7c1d125628f2c7914commit | 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