]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ccdcc2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 21 Aug 2022 01:51:22 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 21 Aug 2022 01:51:22 +0000 (01:51 +0000)
commitb5de7d79456227aa5a933f9b7e429d004ecb8949
tree65ed07bf9a0238372bb8caca1e82e158f0f56e22tree
parent3ccdcc2176bc5e4e03f733c21d05a5a4b0c1af25commit | 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
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history