]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aeb2b11) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 3 Jul 2024 01:20:28 +0000 (01:20 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 3 Jul 2024 01:20:28 +0000 (01:20 +0000)
commit98ff038416c5fc539d5cce0fbcae47b5e878cd58
tree28b95e49dbf5d51722b96dfe6b43cdf304a0e4f9tree
parentaeb2b11fe452f2cb341e20e7d44aadf8a4e8d271commit | 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