]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbba4c4) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 26 Jul 2025 01:34:12 +0000 (01:34 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 26 Jul 2025 01:34:12 +0000 (01:34 +0000)
commitb7d174d33e556d95f6630aee521e5d726cd20a73
tree2b3ddba5985ac9bddbd1818ce8bcffb4c6c1e990tree
parentfbba4c4d855a7ebc949be2f32ee30cad0204bba0commit | 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