]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bee1799) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 12 Jun 2024 01:20:11 +0000 (01:20 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 12 Jun 2024 01:20:11 +0000 (01:20 +0000)
commit02422bca8986769746001658e1b7d10940ae2b8d
treeef44ff197f22e92dbb0b48b19d14b6791b2bfac7tree
parentbee17990d04f8db77d31946ee6c756e9755a9f52commit | 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