]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 86df5ae) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 5 Apr 2022 01:51:00 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 5 Apr 2022 01:51:00 +0000 (01:51 +0000)
commit989d19c126abc35f5c6df2a1117334f1468e48e8
treea0737bdf5143b81fddc27e1739adb687fcc3962ctree
parent86df5ae994e96483559020befd96b838aee4d3eecommit | 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