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 17 2020, 2:58 PM - Parents
- R361:b1b7f23ffc50: GIT_SILENT made messages (after extraction)
- Branches
- Unknown
- Tags
- References
- refs/keep-around/2596a4649c3365427e2314b3db1f88fc31ca2841