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
mlaurent Nov 20 2018, 6:35 AM - Parents
- R206:3a73a0defda8: GIT_SILENT made messages (after extraction)
- Branches
- Unknown
- Tags