]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6cd5e10) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 6 Dec 2021 01:44:56 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 6 Dec 2021 01:44:56 +0000 (01:44 +0000)
commit73e919a4f3fc429b76cc9be2e55d6a000df620e1
treee6996d3d9ac7718d84f54b338200260a8a1dbca0tree
parent6cd5e10f22b584629f62b9b7c1034d57802b7572commit | 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