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
brauch Jul 18 2017, 4:27 PM - Parents
- R39:63120305f4dc: Upgrade KF5 version to 5.30.0.
- Branches
- Unknown
- Tags