]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b987c93) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 25 May 2025 01:35:00 +0000 (01:35 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 25 May 2025 01:35:00 +0000 (01:35 +0000)
commit2ad8b3a51c5035e33fcd4c997a4b4de463dfa25d
treeb56999cb454d6a431898b62a380e257e90e4e321tree
parentb987c93d100e36f649874b7ced13840c7b06f1edcommit | 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