]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cef7ea3) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 1 May 2022 03:11:08 +0000 (03:11 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 1 May 2022 03:11:08 +0000 (03:11 +0000)
commit2834e581e0b734e24f2e3010c4a1bc3c41e2e78a
tree2ac9171d8946f9fc1a1d17a83611a9eb4b7e34aatree
parentcef7ea3be6d94bc23cc3c6e91fa3010838614945commit | 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/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history