]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2a3b731) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 7 Apr 2022 02:58:35 +0000 (02:58 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 7 Apr 2022 02:58:35 +0000 (02:58 +0000)
commite50ff16e6871f6322cad23d8eb907b2f892c9289
tree929ab3877efa982cb20c9a82ab18f3685b0e1f83tree
parent2a3b731ca2b13c518c92951e2d1efa9a53dd70b3commit | 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/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history