]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e843589) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 17 Jun 2024 01:19:40 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 17 Jun 2024 01:19:40 +0000 (01:19 +0000)
commitba8026df8259ac4570129018096e835ec5071724
treee4c7199d4983648745aea8487b7f609f8818739dtree
parente843589057c71e7ba3a626194cb169d5cf241951commit | 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