]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b27270) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 17 May 2022 01:46:51 +0000 (01:46 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 17 May 2022 01:46:51 +0000 (01:46 +0000)
commite34eba7e0fe1720830fd410e4df42205d28f355a
treef9c5fb93316134acd699aaea5a1cc21585386ab6tree
parent0b27270beec7a9b8309322b0c869e71dde30f3d2commit | 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