]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ff693a0) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 18 Dec 2021 01:49:43 +0000 (01:49 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 18 Dec 2021 01:49:43 +0000 (01:49 +0000)
commite980dd20d6e091abddedc7654f2d89c2913bcd1e
treeebf45237e15cadcac3277918085db5494da758fatree
parentff693a00c8683e49fb9b9746344a63cf722435d6commit | 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/org.kde.dolphin.desktop diff | blob | blame | history