]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6584612) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 28 Jan 2022 01:45:57 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 28 Jan 2022 01:45:57 +0000 (01:45 +0000)
commit166e71533e83cf9f47e146c8625130b5d167a91f
treeee78dedbc54cfb4afcedd8826ae0c3197111c99ctree
parent65846125d7f4dd90acd69abf73161607ba76cc8bcommit | 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