]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c14de67) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 11 Jun 2024 01:19:51 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 11 Jun 2024 01:19:51 +0000 (01:19 +0000)
commit5d2b495c44746d37f5e281f46ac7ab6cd9702cc7
tree06a2da516daf2ff3f09e94e9556c9d8bf8df2fc6tree
parentc14de67536b708e3eaa7030ecdff72653e557d07commit | 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