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
rkrawitz Nov 30 2019, 12:58 AM - Parents
- R463:bc782d17d57d: Fix search by GPS coordinates
- Branches
- Unknown
- Tags