]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7002dc4) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 6 Feb 2020 04:34:55 +0000 (05:34 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 6 Feb 2020 04:34:55 +0000 (05:34 +0100)
commit2c29c7ed28f7389ec79907760311fce3a26622c2
tree6a2ff416f91767db8b3d9db03195a2e3a3630a44tree
parent7002dc4e8aacf29826864271c0d11d20d94b4b7bcommit | 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
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history