]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: deb43c9) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 2 Dec 2024 01:33:32 +0000 (01:33 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 2 Dec 2024 01:33:32 +0000 (01:33 +0000)
commitfb5c292555513f047fbc3a9963ad40bd81a4b96f
tree529da0946a6851e551a00a17e144aa60a2263c01tree
parentdeb43c91233eef838c43af22dd0216045d89b430commit | 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