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> Feb 23 2017, 1:04 AM - Parents
- R396:a8ebdf829539: SVN_SILENT made messages (.desktop file) - always resolve ours
- Branches
- Unknown
- Tags
- References
- tag: v17.04.3, tag: v17.04.2, tag: v17.04.1, tag: v17.04.0, tag: v17.03.90, tag: v17.03.80, Applications/17.04