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> May 2 2018, 3:31 AM - Parents
- R459:2bc6c7fa303c: GIT_SILENT: Time to increase to 5.9.0. 5.11 will release in may, 5.8.0 is dead…
- Branches
- Unknown
- Tags