]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 104213a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 6 Mar 2023 01:43:29 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 6 Mar 2023 01:43:29 +0000 (01:43 +0000)
commit7b2a09511d5e2cb0ba85da33043007c9269ecad7
tree1891f138b59529906681fd15e56d9380387c8486tree
parent104213acab967fbe28eb2c7434d58036f9d9ebb0commit | 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/dolphinpartactions.desktop diff | blob | blame | history