]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 11f27e9) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 27 Aug 2024 01:22:38 +0000 (01:22 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 27 Aug 2024 01:22:38 +0000 (01:22 +0000)
commit2dc848d7d1166bfa6c1ae7d9970f6ad7f924d49b
tree5f585497892ccaf65941505cc78d88dbf17659b4tree
parent11f27e98df4084df24f6beae74b5018de6c94878commit | 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/itemactions/movetonewfolderitemaction.json diff | blob | blame | history