]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f122b2e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 10 Aug 2024 01:29:40 +0000 (01:29 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 10 Aug 2024 01:29:40 +0000 (01:29 +0000)
commitbc6803eeefd3d9c9a2f426f5677dd8373a37343a
tree77243646a9de9399896ea99c4b0142427ff31b85tree
parentf122b2e04aa89e0dce5a4f83bb3b9dba950d9985commit | 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