]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 188b73e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 10 Dec 2021 01:45:23 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 10 Dec 2021 01:45:23 +0000 (01:45 +0000)
commit4451c9f2df5b72e63033d3b91bd218ba9ea5cd3a
tree636e537a0a127d088008b95130ee9d0143ad0111tree
parent188b73e7d416a0edcf6bce69cbf8cd089cb30752commit | 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