]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f98383e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 5 Aug 2024 01:22:56 +0000 (01:22 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 5 Aug 2024 01:22:56 +0000 (01:22 +0000)
commit8fb06607483553cf83faf33a8ae88e9c468420ab
treebaea27e39f37b6d1b9c22e02c6026d865b4b004etree
parentf98383e84d4834cadadf7f58d48cd728cb36449fcommit | 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