]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4b22451) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 28 Dec 2021 01:43:52 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 28 Dec 2021 01:43:52 +0000 (01:43 +0000)
commitc071150b7d30c8826496f130b792aed47d4f8326
tree27e7eca88363ff85b56e688feb279a62ca3209f8tree
parent4b224516f4c646b81a1d7842bcedf1c8fbbfc15fcommit | 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