]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aba0de7) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 25 Jun 2025 01:35:28 +0000 (01:35 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 25 Jun 2025 01:35:28 +0000 (01:35 +0000)
commitc7d4b19b88237551bd7cefe0f79670427f1c90c9
tree99f80f888b8f84312bc7c3ffc2de81b359305636tree
parentaba0de7301b060c40d543adbaa8d53cf69a9d7eecommit | 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/dolphinpart.json.in diff | blob | blame | history
src/itemactions/setfoldericonitemaction.json diff | blob | blame | history