]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 736c995) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 10 Sep 2020 04:35:50 +0000 (06:35 +0200)
committerl10n daemon script <scripty@kde.org>
Thu, 10 Sep 2020 04:35:50 +0000 (06:35 +0200)
commit98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e
tree4572b3604d0e83ff75e3f98a8e2c94c7b7339857tree
parent736c9958e7b97ac651a8d7074fd74650ddb5f1abcommit | 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
src/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history