]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bce1f06) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 13 Jun 2022 02:41:50 +0000 (02:41 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 13 Jun 2022 02:41:50 +0000 (02:41 +0000)
commit6401e69a4fff3de68fd372e3e0db0a99eba27bde
tree817ac7446c8848b8f0d700ebe05c9ea664fcf760tree
parentbce1f06b2692d77be92caae9d9c3d7dbf5f9d7f1commit | 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/kcmdolphinviewmodes.json diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history