]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 73ff57b) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 25 Jun 2022 02:01:46 +0000 (02:01 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 25 Jun 2022 02:01:46 +0000 (02:01 +0000)
commita97adfc4fd3287ca53adb3dc2f87739447c3d0c6
treee20e0fc150d15163972fedd6b6b0762c8fe515d1tree
parent73ff57bef44984643bf1ffdb9a478095cfb78dfbcommit | 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