]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 62f1897) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 5 Mar 2022 01:48:28 +0000 (01:48 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 5 Mar 2022 01:48:28 +0000 (01:48 +0000)
commit3366f62b0979752249a7e38769c318c72100aac6
treed037bdc8305f8eaf3b175248236860ad842eb1cftree
parent62f1897e592bbc0976e178ed07fc4faa5451a0cdcommit | 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/kcmdolphinnavigation.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history