]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aa54a68) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 28 Sep 2022 02:00:06 +0000 (02:00 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 28 Sep 2022 02:00:06 +0000 (02:00 +0000)
commit13712a50652047bda8d7c2683ef1278552061680
tree86d6793d9ee6be305e88dbc6d9697ceb114a15c8tree
parentaa54a68e936af4a1a2de0cb7e153cd83b27d5cdbcommit | 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