]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 28ecfd5) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 2 Jan 2022 02:03:50 +0000 (02:03 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 2 Jan 2022 02:03:50 +0000 (02:03 +0000)
commitf386f848dee5b895e859857af68dd5b170e639e1
treebc20d2a1c7ccc599ed075e75f33a17be1349e8a3tree
parent28ecfd5a34eebefa9944840bbf83b4911f59c004commit | 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