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
lieroz Jun 26 2018, 2:18 PM - Parents
- R37:04c2af2c0968: Fix setting the python environment
- Branches
- Unknown
- Tags