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> Jun 3 2016, 9:38 AM - Parents
- R37:9382f7c34368: Merge remote-tracking branch 'origin/krita/3.0'
- Branches
- Unknown
- Tags