]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ae8ca31) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 27 May 2024 01:17:13 +0000 (01:17 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 27 May 2024 01:17:13 +0000 (01:17 +0000)
commitc0b6048af48f66aec30197f852e0a862192744bc
tree907b70b81097dd4a54c33084dd07e3ce8f89e018tree
parentae8ca31f428525a8e3b002cc9e3b3a99df76c5c7commit | 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