]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91eb6aa) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 28 Dec 2017 05:01:08 +0000 (06:01 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 28 Dec 2017 05:01:08 +0000 (06:01 +0100)
commit09dd74348ed16d90577fd7dcf13ed59bc9116cf7
tree4c7f274b3f010543e2eb902b10f263ef7df956cftree
parent91eb6aa37ae38c73441b6100a4ea9beb35e982f4commit | 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