]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 44b0545) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 30 Jun 2024 01:20:00 +0000 (01:20 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 30 Jun 2024 01:20:00 +0000 (01:20 +0000)
commit5eb3240e165ba9875c54ac47c4badf0260653d47
tree9eeee6af17a5a94af188e264219d399618e25f3btree
parent44b05452c3b22a38127f0afa56a23365db23b8c0commit | 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