]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 45bf40d) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 5 Dec 2021 01:44:08 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 5 Dec 2021 01:44:08 +0000 (01:44 +0000)
commit6cd5e10f22b584629f62b9b7c1034d57802b7572
tree1a1b1d1f856c5c40abf4c0a6c5873411e7048308tree
parent45bf40d422246c11d649e5d67a8f1ad5d22f7b11commit | 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