]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7d3e9f7) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 14 Sep 2020 04:15:19 +0000 (06:15 +0200)
committerl10n daemon script <scripty@kde.org>
Mon, 14 Sep 2020 04:15:19 +0000 (06:15 +0200)
commit1d47e9691330ad40113e3652ab2f158a25665ece
tree7594ca25a09d8ec6f7c618322759486a709b5738tree
parent7d3e9f726b0cb4be651fc2f62ebf709288e30769commit | 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/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