]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d192c89) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 24 Jan 2022 01:45:03 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 24 Jan 2022 01:45:03 +0000 (01:45 +0000)
commitf3cf4e3ae11055f297c8dfbe70ca6a3faa61dae7
treef6678ad99a2c32a607d3859000f010302032e123tree
parentd192c8984f350ef6a897f1eac5a13708b485152dcommit | 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