]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7b28475) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 21 Mar 2023 01:43:27 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 21 Mar 2023 01:43:27 +0000 (01:43 +0000)
commit53eba0b14c83b85edbd55962e49c6df3e0049380
tree82f3980805cde0c5f8b442cc6748b69e1fe0f300tree
parent7b2847568f0af9311f26761d4d4da748f83d1054commit | 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