]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4451c9f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 11 Dec 2021 01:42:51 +0000 (01:42 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 11 Dec 2021 01:42:51 +0000 (01:42 +0000)
commitce8d4e5bcd125f45dfebf11ec53234b733de61ff
tree14511ab6fe4ba2a698599dc84b0aa733d0363a9dtree
parent4451c9f2df5b72e63033d3b91bd218ba9ea5cd3acommit | 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