]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dba9b34) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 26 May 2024 01:17:41 +0000 (01:17 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 26 May 2024 01:17:41 +0000 (01:17 +0000)
commit34eb94366ecff868d6e6d66e27a4ca1191564ebc
tree6bd065999fe542543eaae43fb4c4892918935396tree
parentdba9b3435d63b7febd12a153d83a422566d4ecfacommit | 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
src/org.kde.dolphin.desktop diff | blob | blame | history