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 2 2016, 3:35 AM - Differential Revision
- D3551: Fixed dependency order in build system
- Parents
- R185:be89e904a8ce: Merge branch 'fix-buildsystem'
- Branches
- Unknown
- Tags