]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6e6fcf8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 23 Jul 2024 01:21:39 +0000 (01:21 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 23 Jul 2024 01:21:39 +0000 (01:21 +0000)
commitdd4f41bc61866d9deaeaed534ba61099f5f65e89
tree9ca5799429f12c233d646b597f3cc3c85eaf7726tree
parent6e6fcf8da80b5b6821837054ae51eaa19edc24b8commit | 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