]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1939609) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 3 Dec 2021 01:47:17 +0000 (01:47 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 3 Dec 2021 01:47:17 +0000 (01:47 +0000)
commit9ec88ec1aea35abedf3319d331c7a05188b7dba5
tree908eceaeb05757d2395e0e60a25f30560744b5d8tree
parent1939609e703b89d7e2c06514e373857ff2bc925bcommit | 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