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"
Description
Description
Details
Details
- Committed
l10n daemon script <scripty@kde.org> Nov 6 2017, 3:36 AM - Parents
- R887:0572b92e43f8: Merge branch 'master' of git://anongit.kde.org/liquidshell
- Branches
- Unknown
- Tags