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> Apr 6 2020, 3:58 AM - Parents
- R319:a889f6aa4b2b: Remove shortcut for detach tab
- Branches
- Unknown
- Tags
- References
- refs/keep-around/316a51017a6a19076239aca01edde67d09d512c8