]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ec88ec) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 4 Dec 2021 01:44:59 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 4 Dec 2021 01:44:59 +0000 (01:44 +0000)
commiteeaadaf99514be5b1b37dab10035d9abb6fe056c
treee3a38e2ab8631988d0fa12dfaef228f2b8ae8ea4tree
parent9ec88ec1aea35abedf3319d331c7a05188b7dba5commit | 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