]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 694e4e2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 31 Dec 2021 01:44:30 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 31 Dec 2021 01:44:30 +0000 (01:44 +0000)
commitc40fe3b88602441e06e8b8fbbcdfa95c27261b01
treed71d79906b3243911d1faccbe67199cf3c3a3859tree
parent694e4e24526c5f55e162ad9288782e7c82cac38fcommit | 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