]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8a2960) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 26 Aug 2024 01:23:13 +0000 (01:23 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 26 Aug 2024 01:23:13 +0000 (01:23 +0000)
commit310c2c5a941c8b0112204305bb374497ad476976
tree8d2e5bd94cfa7086370e6b56f942fe6348120718tree
parentf8a2960b368217272e8d6c697769fdeefceb323acommit | 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