]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e93d925) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 28 Jul 2024 01:23:46 +0000 (01:23 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 28 Jul 2024 01:23:46 +0000 (01:23 +0000)
commit15bd7990ac4dee19dbdbce6e79c9ea6625ecc0c1
tree5560eb830092f82953541253aa7c84df3a6b587ctree
parente93d9254832babc39df5cc5ee08970dcb4baf57fcommit | 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