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> Jan 24 2016, 9:29 AM - Differential Revision
- D2701: Process QML runtime errors
- Parents
- R32:dfc47ce5d49f: SVN_SILENT made messages (.desktop file) - always resolve ours
- Branches
- Unknown
- Tags