]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1592811) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 23 Sep 2020 04:39:00 +0000 (06:39 +0200)
committerl10n daemon script <scripty@kde.org>
Wed, 23 Sep 2020 04:39:00 +0000 (06:39 +0200)
commit06d629ec6e59c1956e050c304ea7058f2fec89aa
tree84581e6f87ae8f7285737527bcdebfcf412b4924tree
parent15928112ce57902d1b5e0f9f6870b625d6b8056fcommit | 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/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history