]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e87a3a8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 7 Jul 2024 01:19:17 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 7 Jul 2024 01:19:17 +0000 (01:19 +0000)
commit7f9f164b57dd50b40374e93d66803c426a39ab33
tree2ff5b0888fdf196740fb20b898948f602e608228tree
parente87a3a87f3d1600e84f7948996a3da34c27dcc58commit | 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