]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f0749ee) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 25 Jul 2022 01:46:13 +0000 (01:46 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 25 Jul 2022 01:46:13 +0000 (01:46 +0000)
commitef042cbefef0eb1b84336c1d680b5f52bb9557fe
tree2d24bb7ce60db49428faff7d8a650e07074447ebtree
parentf0749ee42ccb2e0a7caee165b9934de8e61bfcbccommit | 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/org.kde.dolphin.desktop diff | blob | blame | history