]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6bd922b) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 20 Aug 2024 01:25:27 +0000 (01:25 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 20 Aug 2024 01:25:27 +0000 (01:25 +0000)
commit427a430fe427f1173121bf57c11e7d9a0d0bdefa
tree885abed5db798f56a5f6cc6aaec96d23a75a5090tree
parent6bd922b936e048a515ea2992d39e4a3568ecd5bbcommit | 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