]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a32cb1c) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 24 Sep 2020 08:10:10 +0000 (10:10 +0200)
committerl10n daemon script <scripty@kde.org>
Thu, 24 Sep 2020 08:10:10 +0000 (10:10 +0200)
commit71bc4498a37086b6805a0b837983d9a5253dd088
tree4f9f53683b662f1a5c78daff8395257243343bd4tree
parenta32cb1c915960320812e7d1d63fe68ffb729ba37commit | 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