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 5 2016, 3:35 AM - Parents
- R414:e796a1148c52: SVN_SILENT made messages (.desktop file) - always resolve ours
- Branches
- Unknown
- Tags
- References
- tag: v17.04.1, tag: v17.04.0, tag: v17.03.90, tag: v17.03.80, tag: v16.12.3, tag: v16.12.2, tag: v16.12.1, tag: v16.12.0, tag: v16.11.90, tag: v16.11.80, tag: v16.08.3, tag: v16.08.2, tag: v16.08.1, tag: v16.08.0, tag: v16.07.90, tag: v16.07.80, Applications/16.12, Applications/16.08