]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d9c712f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 16 Mar 2024 01:17:09 +0000 (01:17 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 16 Mar 2024 01:17:09 +0000 (01:17 +0000)
commitd7bdba870b88beca322ba667765828190d097e35
treed89f0769b873e73d4d612ba4b2f913e703f26e56tree
parentd9c712fda89053b2a05929ea7a4c4babb3001d7acommit | 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