]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 52da2dc) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 29 Oct 2024 01:24:40 +0000 (01:24 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 29 Oct 2024 01:24:40 +0000 (01:24 +0000)
commit99c3c8be59bf1828ab1b9e8827a7c82baddc7501
tree0154f9181401134db6e8f7e06d80b7ba86eefa26tree
parent52da2dc809cde43d2ada7b76e014dd4fee5b62c3commit | 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