]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0a8f84a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 31 May 2024 01:20:40 +0000 (01:20 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 31 May 2024 01:20:40 +0000 (01:20 +0000)
commit035d5b64e1698e55ac20b2f65e51caf08beac3de
tree4207b2053e448fb16da677dba3e960ad51056f6btree
parent0a8f84a52dcd246550b5ea0e795dd7b309f2ece1commit | 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