]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ccc042) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 1 Apr 2022 02:03:03 +0000 (02:03 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 1 Apr 2022 02:03:03 +0000 (02:03 +0000)
commit356ccd21b4d386511ffed5f10fd612b5c82c876c
tree86273d684f6b42d9907309fda17a8eb6f0ccf6fftree
parent3ccc0420a694deeb0d236c7b39ce569bd074f3e8commit | 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