]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6af359f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 22 Jun 2024 01:22:28 +0000 (01:22 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 22 Jun 2024 01:22:28 +0000 (01:22 +0000)
commitaf7e37139d32e562308975a46f28cab0e40965df
treefb0e298c49d053e0fc457007bb03c62423f96e63tree
parent6af359f2c7edbbcc33526f3490ce04ccebfc0e3acommit | 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