]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 01e2a04) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 8 Dec 2021 01:48:36 +0000 (01:48 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 8 Dec 2021 01:48:36 +0000 (01:48 +0000)
commit1035f182b141c8b6ca287eb4fb1e6c6c47e1d5e9
tree9dfb8d50101b80e29b50f11c45e69324bf264c17tree
parent01e2a0446752e8ae7e43043006693086b54d7656commit | 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