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> Dec 20 2016, 11:59 AM - Parents
- R388:0010bb451c27: GIT_SILENT made messages (after extraction)
- Branches
- Unknown
- Tags
- References
- tag: v17.04.1, tag: v17.04.0, tag: v17.03.90, tag: v17.03.80